projects
/
ccan
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tdb2: make tdb1_open use attributes for logging, hash function.
[ccan]
/
tools
/
namespacize.c
diff --git
a/tools/namespacize.c
b/tools/namespacize.c
index 3a3fe47ea94503effe8622b1fc9369e4ebeca2f9..100d79428a1a1de6877c298d48c11e3bab5a0245 100644
(file)
--- a/
tools/namespacize.c
+++ b/
tools/namespacize.c
@@
-53,7
+53,8
@@
static char **get_dir(const char *dir)
names[size++]
= talloc_asprintf(names, "%s/%s", dir, ent->d_name);
}
names[size++]
= talloc_asprintf(names, "%s/%s", dir, ent->d_name);
}
- names[size++] = NULL;
+ /* FIXME: if the loop doesn't run at least once, we'll segfault here */
+ names[size] = NULL;
closedir(d);
return names;
}
closedir(d);
return names;
}
@@
-111,7
+112,7
@@
static void look_for_macros(char *contents, struct replace **repl)
for (p = contents; *p; p++) {
if (*p == '\n')
state = LINESTART;
for (p = contents; *p; p++) {
if (*p == '\n')
state = LINESTART;
- else if (!isspace(*p)) {
+ else if (!
c
isspace(*p)) {
if (state == LINESTART && *p == '#')
state = HASH;
else if (state==HASH && !strncmp(p, "define", 6)) {
if (state == LINESTART && *p == '#')
state = HASH;
else if (state==HASH && !strncmp(p, "define", 6)) {
@@
-177,9
+178,9
@@
static char *get_statement(const void *ctx, char **p)
return answer;
}
/* Compress whitespace into a single ' ' */
return answer;
}
/* Compress whitespace into a single ' ' */
- if (isspace(c)) {
+ if (
c
isspace(c)) {
c = ' ';
c = ' ';
- while (isspace((*p)[1]))
+ while (
c
isspace((*p)[1]))
(*p)++;
} else if (c == '{' || c == '(' || c == '[') {
if (c == '(')
(*p)++;
} else if (c == '{' || c == '(' || c == '[') {
if (c == '(')
@@
-316,11
+317,11
@@
static char *find_word(char *f, const char *str)
while ((p = strstr(p, str)) != NULL) {
/* Check it's not in the middle of a word. */
while ((p = strstr(p, str)) != NULL) {
/* Check it's not in the middle of a word. */
- if (p > f && (isalnum(p[-1]) || p[-1] == '_')) {
+ if (p > f && (
c
isalnum(p[-1]) || p[-1] == '_')) {
p++;
continue;
}
p++;
continue;
}
- if (isalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
+ if (
c
isalnum(p[strlen(str)]) || p[strlen(str)] == '_') {
p++;
continue;
}
p++;
continue;
}
@@
-350,7
+351,7
@@
static const char *rewrite_file(const char *filename,
off = p - file;
memcpy(new, file, off);
off = p - file;
memcpy(new, file, off);
- if (isupper(repl->string[0]))
+ if (
c
isupper(repl->string[0]))
memcpy(new + off, "CCAN_", 5);
else
memcpy(new + off, "ccan_", 5);
memcpy(new + off, "CCAN_", 5);
else
memcpy(new + off, "ccan_", 5);
@@
-406,7
+407,7
@@
static void setup_adjust_files(const char *dir,
static void rename_files(const struct adjusted *adj)
{
while (adj) {
static void rename_files(const struct adjusted *adj)
{
while (adj) {
- if (
rename(adj->tmpfile, adj->file) != 0
)
+ if (
!move_file(adj->tmpfile, adj->file)
)
warn("Could not rename over '%s', we're in trouble",
adj->file);
adj = adj->next;
warn("Could not rename over '%s', we're in trouble",
adj->file);
adj = adj->next;
@@
-445,7
+446,7
@@
static struct replace *read_replacement_file(const char *depdir)
return NULL;
}
return NULL;
}
- for (line = strsplit(file, file, "\n"
, NULL
); *line; line++)
+ for (line = strsplit(file, file, "\n"); *line; line++)
add_replace(&repl, *line);
return repl;
}
add_replace(&repl, *line);
return repl;
}
@@
-457,9
+458,7
@@
static void adjust_dir(const char *dir)
verbose("Adjusting %s\n", dir);
verbose_indent();
verbose("Adjusting %s\n", dir);
verbose_indent();
- for (deps = get_deps(parent, parent, talloc_basename(parent, dir),
- false, NULL);
- *deps; deps++) {
+ for (deps = get_deps(parent, dir, false, NULL); *deps; deps++) {
char *depdir;
struct adjusted *adj = NULL;
struct replace *repl;
char *depdir;
struct adjusted *adj = NULL;
struct replace *repl;
@@
-497,8
+496,7
@@
static void adjust_dependents(const char *dir)
if (access(info, R_OK) != 0)
continue;
if (access(info, R_OK) != 0)
continue;
- for (deps = get_deps(*file, talloc_dirname(*file, *file),
- talloc_basename(*file, *file), false, NULL);
+ for (deps = get_deps(*file, *file, false, NULL);
*deps; deps++) {
if (!strstarts(*deps, "ccan/"))
continue;
*deps; deps++) {
if (!strstarts(*deps, "ccan/"))
continue;