Rename file iterator variables to iter

src/filesdb.c

@@ -553,29 +553,32 @@ write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
  * building up a reverse list, and then peel it apart one
  * entry at a time.
  */
-void reversefilelist_init(struct reversefilelistiter *iterptr,
-                          struct fileinlist *files) {
+void
+reversefilelist_init(struct reversefilelistiter *iter, struct fileinlist *files)
+{
   struct fileinlist *newent;
 
-  iterptr->todo = NULL;
+  iter->todo = NULL;
   while (files) {
     newent= m_malloc(sizeof(struct fileinlist));
     newent->namenode= files->namenode;
-    newent->next= iterptr->todo;
-    iterptr->todo= newent;
+    newent->next = iter->todo;
+    iter->todo = newent;
     files= files->next;
   }
 }
 
-struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr) {
+struct filenamenode *
+reversefilelist_next(struct reversefilelistiter *iter)
+{
   struct filenamenode *ret;
   struct fileinlist *todo;
 
-  todo= iterptr->todo;
+  todo = iter->todo;
   if (!todo)
     return NULL;
   ret= todo->namenode;
-  iterptr->todo= todo->next;
+  iter->todo = todo->next;
   free(todo);
   return ret;
 }
@@ -586,8 +589,10 @@ struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr) {
  * Calling this function is not necessary if reversefilelist_next has
  * been called until it returned 0.
  */
-void reversefilelist_abort(struct reversefilelistiter *iterptr) {
-  while (reversefilelist_next(iterptr));
+void
+reversefilelist_abort(struct reversefilelistiter *iter)
+{
+  while (reversefilelist_next(iter));
 }
 
 struct fileiterator {
@@ -604,32 +609,35 @@ static struct filenamenode *bins[BINS];
 struct fileiterator *
 files_db_iter_new(void)
 {
-  struct fileiterator *i;
-  i= m_malloc(sizeof(struct fileiterator));
-  i->namenode = NULL;
-  i->nbinn= 0;
-  return i;
+  struct fileiterator *iter;
+
+  iter = m_malloc(sizeof(struct fileiterator));
+  iter->namenode = NULL;
+  iter->nbinn = 0;
+
+  return iter;
 }
 
 struct filenamenode *
-files_db_iter_next(struct fileiterator *i)
+files_db_iter_next(struct fileiterator *iter)
 {
   struct filenamenode *r= NULL;
 
-  while (!i->namenode) {
-    if (i->nbinn >= BINS)
+  while (!iter->namenode) {
+    if (iter->nbinn >= BINS)
       return NULL;
-    i->namenode= bins[i->nbinn++];
+    iter->namenode = bins[iter->nbinn++];
   }
-  r= i->namenode;
-  i->namenode= r->next;
+  r = iter->namenode;
+  iter->namenode = r->next;
+
   return r;
 }
 
 void
-files_db_iter_free(struct fileiterator *i)
+files_db_iter_free(struct fileiterator *iter)
 {
-  free(i);
+  free(iter);
 }
 
 void filesdbinit(void) {

src/filesdb.h

@@ -143,15 +143,15 @@ const char *pkgadminfile(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
 struct filepackages_iterator;
 struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn);
-struct pkginfo *filepackages_iter_next(struct filepackages_iterator *i);
-void filepackages_iter_free(struct filepackages_iterator *i);
+struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter);
+void filepackages_iter_free(struct filepackages_iterator *iter);
 
 void filesdbinit(void);
 
 struct fileiterator;
 struct fileiterator *files_db_iter_new(void);
-struct filenamenode *files_db_iter_next(struct fileiterator *i);
-void files_db_iter_free(struct fileiterator *i);
+struct filenamenode *files_db_iter_next(struct fileiterator *iter);
+void files_db_iter_free(struct fileiterator *iter);
 
 void ensure_package_clientdata(struct pkginfo *pkg);
 

src/querycmd.c

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

src/statcmd.c

@@ -191,17 +191,17 @@ statdb_write(void)
 {
 	char *dbname;
 	struct atomic_file *dbfile;
-	struct fileiterator *i;
+	struct fileiterator *iter;
 	struct filenamenode *file;
 
 	dbname = dpkg_db_get_path(STATOVERRIDEFILE);
 	dbfile = atomic_file_new(dbname, aff_backup);
 	atomic_file_open(dbfile);
 
-	i = files_db_iter_new();
-	while ((file = files_db_iter_next(i)))
+	iter = files_db_iter_new();
+	while ((file = files_db_iter_next(iter)))
 		statdb_node_print(dbfile->fp, file);
-	files_db_iter_free(i);
+	files_db_iter_free(iter);
 
 	atomic_file_sync(dbfile);
 	atomic_file_close(dbfile);
@@ -294,7 +294,7 @@ statoverride_remove(const char *const *argv)
 static int
 statoverride_list(const char *const *argv)
 {
-	struct fileiterator *i;
+	struct fileiterator *iter;
 	struct filenamenode *file;
 	const char *thisarg;
 	struct glob_node *glob_list = NULL;
@@ -308,8 +308,8 @@ statoverride_list(const char *const *argv)
 	if (glob_list == NULL)
 		glob_list_prepend(&glob_list, m_strdup("*"));
 
-	i = files_db_iter_new();
-	while ((file = files_db_iter_next(i))) {
+	iter = files_db_iter_new();
+	while ((file = files_db_iter_next(iter))) {
 		struct glob_node *g;
 
 		for (g = glob_list; g; g = g->next) {
@@ -320,7 +320,7 @@ statoverride_list(const char *const *argv)
 			}
 		}
 	}
-	files_db_iter_free(i);
+	files_db_iter_free(iter);
 
 	glob_list_free(glob_list);