Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
7e2c051b
Commit
7e2c051b
authored
Jun 21, 2004
by
Kim F. Storm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
parent
f1a87317
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
41 deletions
+29
-41
src/editfns.c
src/editfns.c
+29
-41
No files found.
src/editfns.c
View file @
7e2c051b
...
...
@@ -3225,6 +3225,7 @@ usage: (format STRING &rest OBJECTS) */)
int
longest_format
;
Lisp_Object
val
;
int
arg_intervals
=
0
;
USE_SAFE_ALLOCA
;
/* discarded[I] is 1 if byte I of the format
string was not copied into the output.
...
...
@@ -3273,7 +3274,7 @@ usage: (format STRING &rest OBJECTS) */)
longest_format
=
0
;
/* Make room in result for all the non-%-codes in the control string. */
total
=
5
+
CONVERTED_BYTE_SIZE
(
multibyte
,
args
[
0
]);
total
=
5
+
CONVERTED_BYTE_SIZE
(
multibyte
,
args
[
0
])
+
1
;
/* Allocate the info and discarded tables. */
{
...
...
@@ -3466,10 +3467,7 @@ usage: (format STRING &rest OBJECTS) */)
/* Allocate the space for the result.
Note that TOTAL is an overestimate. */
if
(
total
<
1000
)
buf
=
(
char
*
)
alloca
(
total
+
1
);
else
buf
=
(
char
*
)
xmalloc
(
total
+
1
);
SAFE_ALLOCA
(
buf
,
char
*
,
total
);
p
=
buf
;
nchars
=
0
;
...
...
@@ -3602,7 +3600,7 @@ usage: (format STRING &rest OBJECTS) */)
maybe_combine_byte
=
1
;
this_nchars
=
strlen
(
p
);
if
(
multibyte
)
p
+=
str_to_multibyte
(
p
,
buf
+
total
-
p
,
this_nchars
);
p
+=
str_to_multibyte
(
p
,
buf
+
total
-
1
-
p
,
this_nchars
);
else
p
+=
this_nchars
;
nchars
+=
this_nchars
;
...
...
@@ -3639,7 +3637,7 @@ usage: (format STRING &rest OBJECTS) */)
*
p
++
=
*
format
++
,
nchars
++
;
}
if
(
p
>
buf
+
total
+
1
)
if
(
p
>
buf
+
total
)
abort
();
if
(
maybe_combine_byte
)
...
...
@@ -3647,8 +3645,7 @@ usage: (format STRING &rest OBJECTS) */)
val
=
make_specified_string
(
buf
,
nchars
,
p
-
buf
,
multibyte
);
/* If we allocated BUF with malloc, free it too. */
if
(
total
>=
1000
)
xfree
(
buf
);
SAFE_FREE
(
total
);
/* If the format string has text properties, or any of the string
arguments has text properties, set up text properties of the
...
...
@@ -4005,12 +4002,9 @@ Transposing beyond buffer boundaries is an error. */)
/* First region smaller than second. */
if
(
len1_byte
<
len2_byte
)
{
/* We use alloca only if it is small,
because we want to avoid stack overflow. */
if
(
len2_byte
>
20000
)
temp
=
(
unsigned
char
*
)
xmalloc
(
len2_byte
);
else
temp
=
(
unsigned
char
*
)
alloca
(
len2_byte
);
USE_SAFE_ALLOCA
;
SAFE_ALLOCA
(
temp
,
unsigned
char
*
,
len2_byte
);
/* Don't precompute these addresses. We have to compute them
at the last minute, because the relocating allocator might
...
...
@@ -4021,23 +4015,20 @@ Transposing beyond buffer boundaries is an error. */)
bcopy
(
start2_addr
,
temp
,
len2_byte
);
bcopy
(
start1_addr
,
start1_addr
+
len2_byte
,
len1_byte
);
bcopy
(
temp
,
start1_addr
,
len2_byte
);
if
(
len2_byte
>
20000
)
xfree
(
temp
);
SAFE_FREE
(
len2_byte
);
}
else
/* First region not smaller than second. */
{
if
(
len1_byte
>
20000
)
temp
=
(
unsigned
char
*
)
xmalloc
(
len1_byte
);
else
temp
=
(
unsigned
char
*
)
alloca
(
len1_byte
);
USE_SAFE_ALLOCA
;
SAFE_ALLOCA
(
temp
,
unsigned
char
*
,
len1_byte
);
start1_addr
=
BYTE_POS_ADDR
(
start1_byte
);
start2_addr
=
BYTE_POS_ADDR
(
start2_byte
);
bcopy
(
start1_addr
,
temp
,
len1_byte
);
bcopy
(
start2_addr
,
start1_addr
,
len2_byte
);
bcopy
(
temp
,
start1_addr
+
len2_byte
,
len1_byte
);
if
(
len1_byte
>
20000
)
xfree
(
temp
);
SAFE_FREE
(
len1_byte
);
}
graft_intervals_into_buffer
(
tmp_interval1
,
start1
+
len2
,
len1
,
current_buffer
,
0
);
...
...
@@ -4054,6 +4045,8 @@ Transposing beyond buffer boundaries is an error. */)
if
(
len1_byte
==
len2_byte
)
/* Regions are same size, though, how nice. */
{
USE_SAFE_ALLOCA
;
modify_region
(
current_buffer
,
start1
,
end1
);
modify_region
(
current_buffer
,
start2
,
end2
);
record_change
(
start1
,
len1
);
...
...
@@ -4065,17 +4058,14 @@ Transposing beyond buffer boundaries is an error. */)
Fset_text_properties
(
make_number
(
start2
),
make_number
(
end2
),
Qnil
,
Qnil
);
if
(
len1_byte
>
20000
)
temp
=
(
unsigned
char
*
)
xmalloc
(
len1_byte
);
else
temp
=
(
unsigned
char
*
)
alloca
(
len1_byte
);
SAFE_ALLOCA
(
temp
,
unsigned
char
*
,
len1_byte
);
start1_addr
=
BYTE_POS_ADDR
(
start1_byte
);
start2_addr
=
BYTE_POS_ADDR
(
start2_byte
);
bcopy
(
start1_addr
,
temp
,
len1_byte
);
bcopy
(
start2_addr
,
start1_addr
,
len2_byte
);
bcopy
(
temp
,
start2_addr
,
len1_byte
);
if
(
len1_byte
>
20000
)
xfree
(
temp
);
SAFE_FREE
(
len1_byte
);
graft_intervals_into_buffer
(
tmp_interval1
,
start2
,
len1
,
current_buffer
,
0
);
graft_intervals_into_buffer
(
tmp_interval2
,
start1
,
...
...
@@ -4085,6 +4075,8 @@ Transposing beyond buffer boundaries is an error. */)
else
if
(
len1_byte
<
len2_byte
)
/* Second region larger than first */
/* Non-adjacent & unequal size, area between must also be shifted. */
{
USE_SAFE_ALLOCA
;
modify_region
(
current_buffer
,
start1
,
end2
);
record_change
(
start1
,
(
end2
-
start1
));
tmp_interval1
=
copy_intervals
(
cur_intv
,
start1
,
len1
);
...
...
@@ -4094,18 +4086,15 @@ Transposing beyond buffer boundaries is an error. */)
Qnil
,
Qnil
);
/* holds region 2 */
if
(
len2_byte
>
20000
)
temp
=
(
unsigned
char
*
)
xmalloc
(
len2_byte
);
else
temp
=
(
unsigned
char
*
)
alloca
(
len2_byte
);
SAFE_ALLOCA
(
temp
,
unsigned
char
*
,
len2_byte
);
start1_addr
=
BYTE_POS_ADDR
(
start1_byte
);
start2_addr
=
BYTE_POS_ADDR
(
start2_byte
);
bcopy
(
start2_addr
,
temp
,
len2_byte
);
bcopy
(
start1_addr
,
start1_addr
+
len_mid
+
len2_byte
,
len1_byte
);
safe_bcopy
(
start1_addr
+
len1_byte
,
start1_addr
+
len2_byte
,
len_mid
);
bcopy
(
temp
,
start1_addr
,
len2_byte
);
if
(
len2_byte
>
20000
)
xfree
(
temp
);
SAFE_FREE
(
len2_byte
);
graft_intervals_into_buffer
(
tmp_interval1
,
end2
-
len1
,
len1
,
current_buffer
,
0
);
graft_intervals_into_buffer
(
tmp_interval_mid
,
start1
+
len2
,
...
...
@@ -4116,6 +4105,8 @@ Transposing beyond buffer boundaries is an error. */)
else
/* Second region smaller than first. */
{
USE_SAFE_ALLOCA
;
record_change
(
start1
,
(
end2
-
start1
));
modify_region
(
current_buffer
,
start1
,
end2
);
...
...
@@ -4126,18 +4117,15 @@ Transposing beyond buffer boundaries is an error. */)
Qnil
,
Qnil
);
/* holds region 1 */
if
(
len1_byte
>
20000
)
temp
=
(
unsigned
char
*
)
xmalloc
(
len1_byte
);
else
temp
=
(
unsigned
char
*
)
alloca
(
len1_byte
);
SAFE_ALLOCA
(
temp
,
unsigned
char
*
,
len1_byte
);
start1_addr
=
BYTE_POS_ADDR
(
start1_byte
);
start2_addr
=
BYTE_POS_ADDR
(
start2_byte
);
bcopy
(
start1_addr
,
temp
,
len1_byte
);
bcopy
(
start2_addr
,
start1_addr
,
len2_byte
);
bcopy
(
start1_addr
+
len1_byte
,
start1_addr
+
len2_byte
,
len_mid
);
bcopy
(
temp
,
start1_addr
+
len2_byte
+
len_mid
,
len1_byte
);
if
(
len1_byte
>
20000
)
xfree
(
temp
);
SAFE_FREE
(
len1_byte
);
graft_intervals_into_buffer
(
tmp_interval1
,
end2
-
len1
,
len1
,
current_buffer
,
0
);
graft_intervals_into_buffer
(
tmp_interval_mid
,
start1
+
len2
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment