diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-06-22 21:23:33 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-06-22 21:23:33 +0200 |
| commit | a45ee50050719aa6a863a89a04b9af8c50202ec6 (patch) | |
| tree | ddf46308969f5abac7bdc8565881b003618a7ea0 | |
| parent | 29fb85e529a598d29c012ed44bb5501e0c54037a (diff) | |
| parent | cb44d79564db216af18d9beb632700e40634f166 (diff) | |
| download | attr-a45ee50050719aa6a863a89a04b9af8c50202ec6.tar.gz | |
Merge branch 'misc'
| -rw-r--r-- | include/misc.h | 5 | ||||
| -rw-r--r-- | libmisc/high_water_alloc.c | 2 | ||||
| -rw-r--r-- | libmisc/quote.c | 2 | ||||
| -rw-r--r-- | libmisc/walk_tree.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/include/misc.h b/include/misc.h index 5f1db58..58c2640 100644 --- a/include/misc.h +++ b/include/misc.h @@ -20,9 +20,4 @@ extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize); extern const char *quote(const char *str); extern char *unquote(char *str); -extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize); - -extern const char *quote(const char *str); -extern char *unquote(char *str); - extern char *next_line(FILE *file); diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c index b07b19d..c127dc1 100644 --- a/libmisc/high_water_alloc.c +++ b/libmisc/high_water_alloc.c @@ -36,7 +36,7 @@ int high_water_alloc(void **buf, size_t *bufsize, size_t newsize) newbuf = realloc(*buf, newsize); if (!newbuf) return 1; - + *buf = newbuf; *bufsize = newsize; } diff --git a/libmisc/quote.c b/libmisc/quote.c index 65cdeb3..4fb7035 100644 --- a/libmisc/quote.c +++ b/libmisc/quote.c @@ -29,7 +29,7 @@ const char *quote(const char *str) const unsigned char *s; char *q; size_t nonpr; - + if (!str) return str; diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c index 2577cc6..2777145 100644 --- a/libmisc/walk_tree.c +++ b/libmisc/walk_tree.c @@ -57,7 +57,7 @@ static int walk_tree_visited(dev_t dev, ino_t ino) static int walk_tree_rec(const char *path, int walk_flags, int (*func)(const char *, const struct stat *, int, - void *), void *arg, int depth) + void *), void *arg, int depth) { int follow_symlinks = (walk_flags & WALK_TREE_LOGICAL) || (!(walk_flags & WALK_TREE_PHYSICAL) && |