Просмотр исходного кода

Use while () instead for () when using package iterators

The code looks more balanced this way.
Guillem Jover лет назад: 16
Родитель
Сommit
9114e9d298
3 измененных файлов с 8 добавлено и 7 удалено
  1. 3 3
      dselect/pkglist.cc
  2. 2 1
      src/depcon.c
  3. 3 3
      src/enquiry.c

+ 3 - 3
dselect/pkglist.cc

@@ -387,9 +387,9 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
   struct pkgiterator *iter;
   struct pkginfo *pkg;
   
-  for (iter=iterpkgstart(), nitems=0;
-       (pkg=iterpkgnext(iter));
-       ) {
+  nitems = 0;
+  iter = iterpkgstart();
+  while ((pkg = iterpkgnext(iter))) {
     struct perpackagestate *state= &datatable[nitems];
     state->pkg= pkg;
     if (pkg->status == pkginfo::stat_notinstalled &&

+ 2 - 1
src/depcon.c

@@ -158,7 +158,8 @@ findbreakcycle(struct pkginfo *pkg)
   struct pkginfo *tpkg;
 	
   /* Clear the visited flag of all packages before we traverse them. */
-  for (iter = iterpkgstart(); (tpkg=iterpkgnext(iter)); ) {
+  iter = iterpkgstart();
+  while ((tpkg = iterpkgnext(iter))) {
     tpkg->clientdata->color = white;
   }
   iterpkgend(iter);

+ 3 - 3
src/enquiry.c

@@ -332,9 +332,9 @@ void predeppackage(const char *const *argv) {
   modstatdb_init(admindir,msdbrw_readonly);
   clear_istobes(); /* We use clientdata->istobe to detect loops */
 
-  for (it = iterpkgstart(), dep = NULL;
-       !dep && (pkg=iterpkgnext(it));
-       ) {
+  dep = NULL;
+  it = iterpkgstart();
+  while (!dep && (pkg = iterpkgnext(it))) {
     if (pkg->want != want_install) continue; /* Ignore packages user doesn't want */
     if (!pkg->files) continue; /* Ignore packages not available */
     pkg->clientdata->istobe= itb_preinstall;