diff options
Diffstat (limited to 'src/directive.c')
-rw-r--r-- | src/directive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/directive.c b/src/directive.c index 401397d..93830b1 100644 --- a/src/directive.c +++ b/src/directive.c @@ -584,20 +584,22 @@ external_check (struct file_triplet *trp) notify (spool->notification, trp, ev_check_fail); } return rc; } -/* Process the directives from TRP, using given SPOOL */ +/* Process the directives from TRP */ int -process_directives (struct file_triplet *trp, const struct spool *spool) +process_directives (struct file_triplet *trp) { int rc, n; const char *key, *val; char *relative_dir; + const struct spool *spool; + ASGN_SPOOL (spool, trp, return 1); UPDATE_STATS (STAT_COMPLETE_TRIPLETS); timer_start ("triplet"); report_init (); for (n = directive_first (trp, &key, &val); n; n = directive_next (trp, n, &key, &val)) { @@ -622,13 +624,13 @@ process_directives (struct file_triplet *trp, const struct spool *spool) trp->file[file_directive].name, val); return 1; } break; case filename_dir: - rc = verify_detached_signature (trp, spool); + rc = verify_detached_signature (trp); if (rc == 0) { if (external_check (trp)) return 1; if (move_file (trp, spool, file_dist, relative_dir) || move_file (trp, spool, file_signature, relative_dir)) |