Explorar el Código

libdpkg: Rename pkg_db_iter_next_pkg() local variable r to pkg

Guillem Jover hace 12 años
padre
commit
2db3d92902
Se han modificado 1 ficheros con 7 adiciones y 7 borrados
  1. 7 7
      lib/dpkg/pkg-db.c

+ 7 - 7
lib/dpkg/pkg-db.c

@@ -331,7 +331,7 @@ pkg_db_iter_next_set(struct pkgiterator *iter)
 struct pkginfo *
 pkg_db_iter_next_pkg(struct pkgiterator *iter)
 {
-  struct pkginfo *r;
+  struct pkginfo *pkg;
 
   while (!iter->pkg) {
     if (iter->nbinn >= BINS)
@@ -341,15 +341,15 @@ pkg_db_iter_next_pkg(struct pkgiterator *iter)
     iter->nbinn++;
   }
 
-  r = iter->pkg;
-  if (r->arch_next)
-    iter->pkg = r->arch_next;
-  else if (r->set->next)
-    iter->pkg = &r->set->next->pkg;
+  pkg = iter->pkg;
+  if (pkg->arch_next)
+    iter->pkg = pkg->arch_next;
+  else if (pkg->set->next)
+    iter->pkg = &pkg->set->next->pkg;
   else
     iter->pkg = NULL;
 
-  return r;
+  return pkg;
 }
 
 /**