diff options
| author | Jim Meyering <meyering@fb.com> | 2014-12-08 21:16:07 -0800 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-12-20 18:51:45 -0800 |
| commit | 9eb391523bc0646d9f0e3d943ed18aad4d60b096 (patch) | |
| tree | 9a4e28bd7e8c440649c78d22c80152fe2f52cbbb | |
| parent | bea07ed28fd392d81b4e942ac8e7d51a02260b88 (diff) | |
| download | sed-9eb391523bc0646d9f0e3d943ed18aad4d60b096.tar.gz | |
maint: begin to use "size_t" more, where appropriate
* sed/execute.c (do_list): Update some "int" locals to "size_t",
and combine a few declarations with needlessly separate initializations.
| -rw-r--r-- | sed/execute.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sed/execute.c b/sed/execute.c index f398e7c..c839451 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -1496,8 +1496,8 @@ execute_program(struct vector *vec, struct input *input) if (mbclen < trans_len) { - int new_len; - new_len = line.length + 1 + trans_len - mbclen; + size_t new_len = (line.length + 1 + + trans_len - mbclen); /* We must extend the line buffer. */ if (line.alloc < new_len) { @@ -1514,13 +1514,11 @@ execute_program(struct vector *vec, struct input *input) prev_idx = idx; if (move_remain_buffer) { - int move_len, move_offset; - char *move_from, *move_to; /* Move the remaining with \0. */ - move_from = line.active + idx + mbclen; - move_to = line.active + idx + trans_len; - move_len = line.length + 1 - idx - mbclen; - move_offset = trans_len - mbclen; + char const *move_from = line.active + idx + mbclen; + char *move_to = line.active + idx + trans_len; + size_t move_len = line.length + 1 - idx - mbclen; + size_t move_offset = trans_len - mbclen; memmove(move_to, move_from, move_len); line.length += move_offset; idx += move_offset; |