Rename directory_pair to spool

1 files changed, 26 insertions, 26 deletions

diff --git a/src/wydawca.h b/src/wydawca.h
index 5b57ed0..21e4de4 100644
--- a/src/wydawca.h
+++ b/src/wydawca.h
@@ -156,7 +156,7 @@ struct file_triplet
   char *name;              /* Triplet base name */
   gid_t gid;               /* Owner GID */
   struct file_info file[FILE_TYPE_COUNT]; /* Components */
-  struct directory_pair *dpair; /* Owning directory pair */
+  struct spool *spool;     /* Owning spool */
   char **directive;        /* Decoded directive pairs (key: value\0) */
   char *blurb;             /* Block of directives: directive[i] points here */
   char *tmp;               /* Temporary storage */
@@ -179,27 +179,27 @@ struct virt_tab
 {
   int (*test_url)      (mu_url_t url, gconf_locus_t *loc);
   int (*move_file)     (struct file_triplet *trp,
-			struct directory_pair *dpair,
+			struct spool *spool,
 			enum file_type file_id,
 			const char *reldir);
   int (*archive_file)  (struct file_triplet *trp,
-			struct directory_pair *dpair,
+			struct spool *spool,
 			const char *reldir,
 			const char *file_name);
   int (*symlink_file)  (struct file_triplet *trp,
-			struct directory_pair *dpair,
+			struct spool *spool,
 			const char *reldir,
 			const char *wanted_src,
 			const char *wanted_dst);
   int (*rmsymlink_file)(struct file_triplet *trp,
-			struct directory_pair *dpair,
+			struct spool *spool,
 			const char *reldir,
 			const char *file_name);
 };
 
-/* A source/destination directory pair. This structure contains all the
-   data necessary for releasing files from source to destination */
-struct directory_pair
+/* An upload spool. This structure contains all data necessary for releasing 
+   files from source to destination */
+struct spool
 {
   char *url;                             /* Download URL */
   char *source_dir;                      /* Source directory */
@@ -343,9 +343,9 @@ enum exec_result wydawca_exec (int argc, const char **argv, int *retcode);
 
 /* Directory scanning and registering */
 void scan_directories (void);
-void register_directory_pair (struct directory_pair *dpair);
+void register_spool (struct spool *spool);
 void register_file (struct file_info *finfo);
-void enumerate_triplets (struct directory_pair *);
+void enumerate_triplets (struct spool *);
 size_t count_collected_triplets (void);
 char *triplet_expand_param (const char *tmpl, struct file_triplet *trp);
 
@@ -370,12 +370,12 @@ unsigned method_num_cols (struct access_method *method);
 
 /* Verification functions */
 int verify_directive_file (struct file_triplet *trp,
-			   struct directory_pair *dpair);
+			   struct spool *spool);
 int verify_directive_signature (struct file_triplet *trp,
-				struct directory_pair *dpair,
+				struct spool *spool,
 				const char *pubkey);
 int verify_detached_signature (struct file_triplet *trp,
-			       struct directory_pair *dpair);
+			       struct spool *spool);
 int fill_project_name (struct file_triplet *trp);
 
 /* Directive file support */
@@ -391,7 +391,7 @@ int directive_first (struct file_triplet *trp,
 int directive_next (struct file_triplet *trp, int n,
 		    const char **pkey, const char **pval);
 int process_directives (struct file_triplet *trp,
-			struct directory_pair *dpair);
+			struct spool *spool);
 
 int match_uid (uid_t uid);
 
@@ -408,42 +408,42 @@ void config_help (void);
 int url_to_vtab (mu_url_t url, struct virt_tab *vtab);
 
 int
-move_file (struct file_triplet *trp, struct directory_pair *dpair,
+move_file (struct file_triplet *trp, struct spool *spool,
 	   enum file_type file_id, const char *reldir);	  
 int
-archive_file (struct file_triplet *trp, struct directory_pair *dpair,
+archive_file (struct file_triplet *trp, struct spool *spool,
 	      const char *reldir, const char *file_name);	  
 int
-symlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+symlink_file (struct file_triplet *trp, struct spool *spool,
 	      const char *reldir,
 	      const char *wanted_src, const char *wanted_dst);
 int
-rmsymlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+rmsymlink_file (struct file_triplet *trp, struct spool *spool,
 		const char *reldir, const char *file_name);
 
 
 /* diskio.c */
 
 int dir_test_url (mu_url_t url, gconf_locus_t *locus);
-int dir_move_file (struct file_triplet *trp, struct directory_pair *dpair,
+int dir_move_file (struct file_triplet *trp, struct spool *spool,
 		   enum file_type file_id, const char *reldir);
-int dir_archive_file (struct file_triplet *trp, struct directory_pair *dpair,
+int dir_archive_file (struct file_triplet *trp, struct spool *spool,
 		      const char *file_name, const char *reldir);
-int dir_symlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+int dir_symlink_file (struct file_triplet *trp, struct spool *spool,
 		      const char *reldir,
 		      const char *wanted_src, const char *wanted_dst);
-int dir_rmsymlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+int dir_rmsymlink_file (struct file_triplet *trp, struct spool *spool,
 			const char *reldir, const char *file_name);
 
 /* null.c */
-int null_move_file (struct file_triplet *trp, struct directory_pair *dpair,
+int null_move_file (struct file_triplet *trp, struct spool *spool,
 		    enum file_type file_id, const char *reldir);
-int null_archive_file (struct file_triplet *trp, struct directory_pair *dpair,
+int null_archive_file (struct file_triplet *trp, struct spool *spool,
 		       const char *file_name, const char *reldir);
-int null_symlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+int null_symlink_file (struct file_triplet *trp, struct spool *spool,
 		       const char *reldir,
 		       const char *wanted_src, const char *wanted_dst);
-int null_rmsymlink_file (struct file_triplet *trp, struct directory_pair *dpair,
+int null_rmsymlink_file (struct file_triplet *trp, struct spool *spool,
 			 const char *reldir, const char *file_name);