Rename iterfiles*() functions to files_db_iter_*()

src/divertcmd.c

@@ -351,8 +351,8 @@ divertdb_write(void)
 	file = atomic_file_new(dbname, aff_backup);
 	atomic_file_open(file);
 
-	iter = iterfilestart();
-	while ((namenode = iterfilenext(iter))) {
+	iter = files_db_iter_new();
+	while ((namenode = files_db_iter_next(iter))) {
 		struct diversion *d = namenode->divert;
 
 		if (d == NULL || d->useinstead == NULL)
@@ -363,7 +363,7 @@ divertdb_write(void)
 		        d->useinstead->name,
 		        diversion_pkg_name(d));
 	}
-	iterfileend(iter);
+	files_db_iter_free(iter);
 
 	atomic_file_sync(file);
 	atomic_file_close(file);
@@ -594,8 +594,8 @@ diversion_list(const char *const *argv)
 	if (glob_list == NULL)
 		glob_list_prepend(&glob_list, m_strdup("*"));
 
-	iter = iterfilestart();
-	while ((namenode = iterfilenext(iter))) {
+	iter = files_db_iter_new();
+	while ((namenode = files_db_iter_next(iter))) {
 		struct glob_node *g;
 		struct diversion *contest = namenode->divert;
 		struct diversion *altname;
@@ -617,7 +617,7 @@ diversion_list(const char *const *argv)
 			}
 		}
 	}
-	iterfileend(iter);
+	files_db_iter_free(iter);
 
 	glob_list_free(glob_list);
 

src/filesdb.c

@@ -601,7 +601,9 @@ struct fileiterator {
 
 static struct filenamenode *bins[BINS];
 
-struct fileiterator *iterfilestart(void) {
+struct fileiterator *
+files_db_iter_new(void)
+{
   struct fileiterator *i;
   i= m_malloc(sizeof(struct fileiterator));
   i->namenode = NULL;
@@ -609,7 +611,9 @@ struct fileiterator *iterfilestart(void) {
   return i;
 }
 
-struct filenamenode *iterfilenext(struct fileiterator *i) {
+struct filenamenode *
+files_db_iter_next(struct fileiterator *i)
+{
   struct filenamenode *r= NULL;
 
   while (!i->namenode) {
@@ -622,7 +626,9 @@ struct filenamenode *iterfilenext(struct fileiterator *i) {
   return r;
 }
 
-void iterfileend(struct fileiterator *i) {
+void
+files_db_iter_free(struct fileiterator *i)
+{
   free(i);
 }
 

src/filesdb.h

@@ -149,9 +149,9 @@ void filepackages_iter_free(struct filepackages_iterator *i);
 void filesdbinit(void);
 
 struct fileiterator;
-struct fileiterator *iterfilestart(void);
-struct filenamenode *iterfilenext(struct fileiterator *i);
-void iterfileend(struct fileiterator *i);
+struct fileiterator *files_db_iter_new(void);
+struct filenamenode *files_db_iter_next(struct fileiterator *i);
+void files_db_iter_free(struct fileiterator *i);
 
 void ensure_package_clientdata(struct pkginfo *pkg);
 

src/querycmd.c

@@ -360,12 +360,12 @@ searchfiles(const char *const *argv)
       namenode= findnamenode(thisarg, 0);
       found += searchoutput(namenode);
     } else {
-      it= iterfilestart();
-      while ((namenode = iterfilenext(it)) != NULL) {
+      it = files_db_iter_new();
+      while ((namenode = files_db_iter_next(it)) != NULL) {
         if (fnmatch(thisarg,namenode->name,0)) continue;
         found+= searchoutput(namenode);
       }
-      iterfileend(it);
+      files_db_iter_free(it);
     }
     if (!found) {
       fprintf(stderr, _("%s: no path found matching pattern %s.\n"),

src/statcmd.c

@@ -198,10 +198,10 @@ statdb_write(void)
 	dbfile = atomic_file_new(dbname, aff_backup);
 	atomic_file_open(dbfile);
 
-	i = iterfilestart();
-	while ((file = iterfilenext(i)))
+	i = files_db_iter_new();
+	while ((file = files_db_iter_next(i)))
 		statdb_node_print(dbfile->fp, file);
-	iterfileend(i);
+	files_db_iter_free(i);
 
 	atomic_file_sync(dbfile);
 	atomic_file_close(dbfile);
@@ -308,8 +308,8 @@ statoverride_list(const char *const *argv)
 	if (glob_list == NULL)
 		glob_list_prepend(&glob_list, m_strdup("*"));
 
-	i = iterfilestart();
-	while ((file = iterfilenext(i))) {
+	i = files_db_iter_new();
+	while ((file = files_db_iter_next(i))) {
 		struct glob_node *g;
 
 		for (g = glob_list; g; g = g->next) {
@@ -320,7 +320,7 @@ statoverride_list(const char *const *argv)
 			}
 		}
 	}
-	iterfileend(i);
+	files_db_iter_free(i);
 
 	glob_list_free(glob_list);