diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 10:25:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 18:31:56 +0100 |
| commit | 17504818a4ad2e5864ae9293751d42a7cad1e27d (patch) | |
| tree | bac1825c3611657da991be36f32a23c7c66a4001 /solenv/bin/concat-deps.c | |
| parent | c59ec659ee5cd262c765ed101605b1c87fea2a6d (diff) | |
Avoid reserved identifiers
Change-Id: I6275327a1b079f8cc0939e608dbbaff544ab05b0
Diffstat (limited to 'solenv/bin/concat-deps.c')
| -rw-r--r-- | solenv/bin/concat-deps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 517e4d076f16..fb2caee49b09 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -689,7 +689,7 @@ int fd; return buffer; } -static void _cancel_relative(char const * base, char** ref_cursor, char** ref_cursor_out, char const * end) +static void cancel_relative(char const * base, char** ref_cursor, char** ref_cursor_out, char const * end) { char* cursor = *ref_cursor; char* cursor_out = *ref_cursor_out; @@ -906,7 +906,7 @@ FILE* depfile; return !depfile; } -static int _process(struct hash* dep_hash, char* fn) +static int process(struct hash* dep_hash, char* fn) { int rc; char* buffer; @@ -944,7 +944,7 @@ off_t size; { if(!memcmp(cursor, "/../", 4)) { - _cancel_relative(base, &cursor, &cursor_out, end); + cancel_relative(base, &cursor, &cursor_out, end); } } *cursor_out++ = *cursor++; @@ -1097,7 +1097,7 @@ off_t size; return rc; } -static void _usage(void) +static void usage(void) { fputs("Usage: concat-deps <file that contains dep_files>\n", stderr); } @@ -1128,7 +1128,7 @@ const char *env_str; if(argc < 2) { - _usage(); + usage(); return 1; } if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR")) @@ -1157,7 +1157,7 @@ const char *env_str; *in_list_cursor = 0; if(in_list_base < in_list_cursor) { - rc = _process(dep_hash, in_list_base); + rc = process(dep_hash, in_list_base); if(rc) { break; @@ -1176,7 +1176,7 @@ const char *env_str; /* catch the last entry in case the input did not terminate with a 'space' */ if(in_list_base < in_list_cursor) { - rc = _process(dep_hash, in_list_base); + rc = process(dep_hash, in_list_base); } } #ifdef HASH_STAT |