diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2010-08-23 13:25:58 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2010-08-23 13:27:36 -0700 |
commit | 34795cedb7db68babf7eae672ba47fd486555be8 (patch) | |
tree | 7358ab2e239686f3794d8577867c305953ce999c /src/incremen.c | |
parent | 9764a6b1d3b91b654728c04a645f20c605970562 (diff) | |
download | tar-34795cedb7db68babf7eae672ba47fd486555be8.tar.gz |
tar: don't export names that aren't used elsewhere
* src/common.h (file_dumpable_p, gid_to_chars, major_to_chars):
(minor_to_chars, mode_to_chars, uid_to_chars, uintmax_to_chars):
(string_to_chars, dumpdir_creat0, dumpdir_create, dumpdir_free):
(dumpdir_locate, dumpdir_next, dumpdir_first, gid_from_header):
(major_from_header, minor_from_header, mode_from_header):
(time_from_header, uid_from_header, quote_copy_string, request_stdin):
(xheader_init, transform_header_name):
Remove declarations; these are no longer exported from their modules.
(GID_TO_CHARS, MAJOR_TO_CHARS, MINOR_TO_CHARS, MODE_TO_CHARS):
(UID_TO_CHARS, UINTMAX_TO_CHARS, UNAME_TO_CHARS, GNAME_TO_CHARS):
Move to src/create.c, since no other module uses these.
(GID_FROM_HEADER, MAJOR_FROM_HEADER, MINOR_FROM_HEADER):
(MODE_FROM_HEADER, TIME_FROM_HEADER, UID_FROM_HEADER):
Move to src/extract.c, since no other module uses these.
(dumpdir_t, dumpdir_iter_t): Remove; no longer used.
* src/create.c (gid_to_chars, major_to_chars, minor_to_chars):
(mode_to_chars, uid_to_chars, uintmax_to_chars, string_to_chars):
(file_dumpable_p): Now static.
* src/incremen.c (dumpdir_create0, dumpdir_create, dumpdir_free):
(dumpdir_locate, dumpdir_next, dumpdir_first): Now static.
(scan_directory, write_directory_file_entry):
Use struct dumpdir_iter * rather than dumpdir_iter_t.
* src/list.c (gid_from_header, major_from_header, minor_from_header):
(mode_from_header, time_from_header, uid_from_header):
(transform_member_name): Now static.
* src/misc.c (quote_copy_string): #if 0 out, as it's not used
anywhere.
* src/system.c (wait_for_grandchild): Now static.
* src/tar.c (request_stdin): Now static.
* src/xheader.c (xheader_init): Now static.
Diffstat (limited to 'src/incremen.c')
-rw-r--r-- | src/incremen.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/incremen.c b/src/incremen.c index 0d1c115c..5f00944f 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -77,7 +77,7 @@ struct directory char *name; /* file name of directory */ }; -struct dumpdir * +static struct dumpdir * dumpdir_create0 (const char *contents, const char *cmask) { struct dumpdir *dump; @@ -108,13 +108,13 @@ dumpdir_create0 (const char *contents, const char *cmask) return dump; } -struct dumpdir * +static struct dumpdir * dumpdir_create (const char *contents) { return dumpdir_create0 (contents, "YND"); } -void +static void dumpdir_free (struct dumpdir *dump) { free (dump->elv); @@ -131,7 +131,7 @@ compare_dirnames (const void *first, const void *second) /* Locate NAME in the dumpdir array DUMP. Return pointer to the slot in DUMP->contents, or NULL if not found */ -char * +static char * dumpdir_locate (struct dumpdir *dump, const char *name) { char **ptr; @@ -150,7 +150,7 @@ struct dumpdir_iter size_t next; /* Index of the next element */ }; -char * +static char * dumpdir_next (struct dumpdir_iter *itr) { size_t cur = itr->next; @@ -172,7 +172,7 @@ dumpdir_next (struct dumpdir_iter *itr) return ret; } -char * +static char * dumpdir_first (struct dumpdir *dump, int all, struct dumpdir_iter **pitr) { struct dumpdir_iter *itr = xmalloc (sizeof (*itr)); @@ -723,7 +723,7 @@ scan_directory (char *dir, dev_t device, bool cmdline) if (dirp && directory->children != NO_CHILDREN) { char *entry; /* directory entry being scanned */ - dumpdir_iter_t itr; + struct dumpdir_iter *itr; makedumpdir (directory, dirp); @@ -1386,7 +1386,7 @@ write_directory_file_entry (void *entry, void *data) if (directory->dump) { const char *p; - dumpdir_iter_t itr; + struct dumpdir_iter *itr; for (p = dumpdir_first (directory->dump, 0, &itr); p; |