diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-03 11:44:34 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-03 11:49:20 +0200 |
commit | c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69 (patch) | |
tree | 93711f398c585fcc8ac0b19bbcfe15b79f4c6b73 /src/triplet.c | |
parent | a2489ce17e9c9a03b649d5b63183d4f830c639a1 (diff) | |
download | wydawca-c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69.tar.gz wydawca-c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69.tar.bz2 |
Do not pass spool as a separate parameter, register it early in the triplet.
* src/directive.c (process_directives): Remove spool parameter.
* src/gpg.c (verify_directive_signature)
(verify_detached_signature): Remove spool parameter.
* src/process.c (scan_spool_unlocked): Update call to register_file.
* src/triplet.c (register_file): Take spool ptr as second argument.
(triplet_processor): Ignore proc_data.
(enumerate_triplets): Pass NULL as proc_data.
* src/verify.c (verify_directive_file): Remove spool parameter.
* src/wydawca.h (ASGN_SPOOL): New macro.
(register_file, verify_directive_file)
(verify_directive_signature, verify_detached_signature)
(process_directives): Remove spool parameter.
* src/getopt.m4 (print_help): Minor fix.
Diffstat (limited to 'src/triplet.c')
-rw-r--r-- | src/triplet.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/triplet.c b/src/triplet.c index 0744daa..efe4a0b 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -60,7 +60,7 @@ hash_triplet_free (void *data) /* Register a file in the triplet table */ void -register_file (struct file_info *finfo) +register_file (struct file_info *finfo, const struct spool *spool) { struct file_triplet *tp, *ret; @@ -69,7 +69,8 @@ register_file (struct file_info *finfo) tp->name = (char*)(tp + 1); memcpy (tp->name, finfo->name, finfo->root_len); tp->name[finfo->root_len] = 0; - + tp->spool = spool; + if (! ((triplet_table || (triplet_table = hash_initialize (0, 0, hash_triplet_hasher, @@ -123,7 +124,7 @@ check_triplet_state (struct file_triplet *trp) { if (trp->file[file_directive].name) { - if (verify_directive_file (trp, trp->spool)) + if (verify_directive_file (trp)) return triplet_bad; if (trp->file[file_dist].name == 0 @@ -176,9 +177,6 @@ static bool triplet_processor (void *data, void *proc_data) { struct file_triplet *trp = data; - const struct spool *spool = proc_data; - - trp->spool = spool; if (debug_level) logmsg (LOG_DEBUG, "FILE %s, DIST=%s, SIG=%s, DIRECTIVE=%s", @@ -193,7 +191,7 @@ triplet_processor (void *data, void *proc_data) case triplet_complete: if (debug_level) logmsg (LOG_DEBUG, _("processing triplet `%s'"), trp->name); - if (process_directives (trp, spool)) + if (process_directives (trp)) remove_triplet (trp); return true; @@ -210,7 +208,7 @@ triplet_processor (void *data, void *proc_data) return true; } - if (triplet_expired_p (trp, spool->file_sweep_time)) + if (triplet_expired_p (trp, trp->spool->file_sweep_time)) { UPDATE_STATS (STAT_EXPIRED_TRIPLETS); remove_triplet (trp); @@ -228,7 +226,7 @@ enumerate_triplets (const struct spool *spool) spool->tag, mu_url_to_string (spool->dest_url)); if (triplet_table) { - hash_do_for_each (triplet_table, triplet_processor, (void*) spool); + hash_do_for_each (triplet_table, triplet_processor, NULL); hash_clear (triplet_table); } } |