Cleanup white spaces

Remove trailing spaces. Remove blank lines not separating different code
blocks. Remove blank lines at the end of the file.

ChangeLog.old

@@ -16927,4 +16927,3 @@ Thu Aug 25 11:46:27 1994  Ian Murdock  (imurdock@debra.debian.org)
         link never being removed at all.
 
 ChangeLog begins Thu Aug 25 11:46:27 1994 for dpkg 0.93.5.
-

README.translators

@@ -76,4 +76,3 @@ Update to 1354t.
   - msgmerge updates your file with the current POT file.
   - msgfmt checks it for validity.
   - msgcat may detect encoding problems.
-

TODO

@@ -182,4 +182,3 @@ other stuff unlikely to get done soon
  * how to change case of package names
  * `fake' or `null' packages
  * dpkg --query | -Q
-

debian/usertags

@@ -166,4 +166,3 @@ usercategory dpkg-maint
  * severity
  * classification
 `---
-

doc/README.feature-removal-schedule

@@ -114,4 +114,3 @@ Why:
  Having two ways to let the administrator get to a shell on conffile prompt
  is confusing, it also difficults setting up a consistent environment to be
  used by external programs.
-

doc/triggers.txt

@@ -817,5 +817,3 @@ are <package, trigger name> tuples.)
 (See `Processing' above for discussion of dependency cycles.)
 
 --
-
-

dpkg-deb/Makefile.am

@@ -23,4 +23,3 @@ dpkg_deb_LDADD = \
 	$(LIBINTL) \
 	$(ZLIB_LIBS) \
 	$(BZ2_LIBS)
-

dpkg-deb/build.c

@@ -138,7 +138,7 @@ getfi(const char *root, int fd)
     fn = m_realloc(fn, fnlen);
   }
   i=sprintf(fn,"%s/",root);
-  
+
   while (1) {
     int	res;
     if (i>=fnlen) {
@@ -186,7 +186,7 @@ add_to_filist(struct file_info **start, struct file_info **end,
 {
   if (*start==NULL)
     *start=*end=fi;
-  else 
+  else
     *end=(*end)->next=fi;
 }
 
@@ -211,7 +211,7 @@ void do_build(const char *const *argv) {
   static const char *const maintainerscripts[]= {
     PREINSTFILE, POSTINSTFILE, PRERMFILE, POSTRMFILE, NULL
   };
-  
+
   char *m;
   const char *debar, *directory, *const *mscriptp, *versionstring, *arch;
   bool subdir;
@@ -250,7 +250,7 @@ void do_build(const char *const *argv) {
     strcat(m, DEBEXT);
     debar= m;
   }
-    
+
   /* Perform some sanity checks on the to-be-build package. */
   if (nocheckflag) {
     if (subdir)
@@ -386,7 +386,7 @@ void do_build(const char *const *argv) {
 
   }
   m_output(stdout, _("<standard output>"));
-  
+
   /* Now that we have verified everything its time to actually
    * build something. Let's start by making the ar-wrapper. */
   if (!(ar=fopen(debar,"wb"))) ohshite(_("unable to create `%.255s'"),debar);
@@ -445,7 +445,7 @@ void do_build(const char *const *argv) {
     dpkg_ar_member_put_mem(debar, fileno(ar), DEBMAGIC,
                            deb_magic, strlen(deb_magic));
     dpkg_ar_member_put_file(debar, fileno(ar), ADMINMEMBER, gzfd);
-  }                
+  }
 
   /* Control is done, now we need to archive the data. Start by creating
    * a new temporary file. Immediately unlink the temporary file so others
@@ -535,7 +535,6 @@ void do_build(const char *const *argv) {
   if (fsync(fileno(ar)))
     ohshite(_("unable to sync file '%s'"), debar);
   if (fclose(ar)) werr(debar);
-                             
+
   exit(0);
 }
-

dpkg-deb/extract.c

@@ -51,7 +51,7 @@
 static void movecontrolfiles(const char *thing) {
   char buf[200];
   pid_t c1;
-  
+
   sprintf(buf, "mv %s/* . && rmdir %s", thing, thing);
   c1 = subproc_fork();
   if (!c1) {
@@ -137,7 +137,7 @@ void extracthalf(const char *debar, const char *directory,
   int adminmember;
   bool oldformat, header_done;
   struct compressor *decompressor = &compressor_gzip;
-  
+
   arfd = open(debar, O_RDONLY);
   if (arfd < 0)
     ohshite(_("failed to read archive `%.255s'"), debar);
@@ -268,7 +268,6 @@ void extracthalf(const char *debar, const char *directory,
       m_output(stdout, _("<standard output>"));
     }
   } else {
-    
     if (!strncmp(versionbuf,"!<arch>",7)) {
       fprintf(stderr,
               _("dpkg-deb: file looks like it might be an archive which has been\n"
@@ -276,7 +275,6 @@ void extracthalf(const char *debar, const char *directory,
     }
 
     ohshit(_("`%.255s' is not a debian format archive"),debar);
-
   }
 
   m_pipe(p1);
@@ -291,7 +289,7 @@ void extracthalf(const char *debar, const char *directory,
   close(p1[1]);
 
   if (taroption) m_pipe(p2);
-  
+
   c2 = subproc_fork();
   if (!c2) {
     m_dup2(p1[0], 0);
@@ -333,7 +331,7 @@ void extracthalf(const char *debar, const char *directory,
     close(p2[0]);
     subproc_wait_check(c3, "tar", 0);
   }
-  
+
   subproc_wait_check(c2, _("<decompress>"), PROCPIPE);
   if (c1 != -1)
     subproc_wait_check(c1, _("paste"), 0);
@@ -350,7 +348,7 @@ static void controlextractvextract(int admin,
                                    const char *taroptions,
                                    const char *const *argv) {
   const char *debar, *directory;
-  
+
   if (!(debar= *argv++))
     badusage(_("--%s needs a .deb filename argument"),cipaction->olong);
   if (!(directory= *argv++)) {
@@ -365,17 +363,14 @@ static void controlextractvextract(int admin,
 
 void do_fsystarfile(const char *const *argv) {
   const char *debar;
-  
+
   if (!(debar= *argv++))
     badusage(_("--%s needs a .deb filename argument"),cipaction->olong);
   if (*argv)
     badusage(_("--%s takes only one argument (.deb filename)"),cipaction->olong);
   extracthalf(debar, NULL, NULL, 0);
 }
-   
+
 void do_control(const char *const *argv) { controlextractvextract(1, "x", argv); }
 void do_extract(const char *const *argv) { controlextractvextract(0, "xp", argv); }
 void do_vextract(const char *const *argv) { controlextractvextract(0, "xpv", argv); }
-
-
-

dpkg-deb/info.c

@@ -63,14 +63,14 @@ static void cu_info_prepare(int argc, void **argv) {
     ohshite(_("unable to execute %s (%s)"), _("rm command for cleanup"), RM);
   }
   subproc_wait_check(c1, _("rm command for cleanup"), 0);
-} 
+}
 
 static void info_prepare(const char *const **argvp,
                          const char **debarp,
                          const char **directoryp,
                          int admininfo) {
   char *dbuf;
-  
+
   *debarp= *(*argvp)++;
   if (!*debarp) badusage(_("--%s needs a .deb filename argument"),cipaction->olong);
 
@@ -289,7 +289,7 @@ void do_field(const char *const *argv) {
 
 void do_contents(const char *const *argv) {
   const char *debar;
-  
+
   if (!(debar= *argv++) || *argv) badusage(_("--contents takes exactly one argument"));
   extracthalf(debar, NULL, "tv", 0);
 }

dpkg-split/info.c

@@ -93,13 +93,13 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
   struct ar_hdr arh;
   int c;
   struct stat stab;
-  
+
   if (fread(magicbuf, 1, sizeof(magicbuf), partfile) != sizeof(magicbuf)) {
     if (ferror(partfile)) rerr(fn); else return NULL;
   }
   if (memcmp(magicbuf, DPKG_AR_MAGIC, sizeof(magicbuf)))
     return NULL;
-  
+
   if (fread(&arh,1,sizeof(arh),partfile) != sizeof(arh)) rerreof(partfile,fn);
 
   dpkg_ar_normalize_name(&arh);
@@ -143,7 +143,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
                                fn, _("archive total size"));
   ir->maxpartlen = unsignedlong(nextline(&rip, fn, _("archive part offset")),
                                 fn, _("archive part offset"));
-  
+
   partnums = nextline(&rip, fn, _("archive part numbers"));
   slash= strchr(partnums,'/');
   if (!slash)
@@ -193,13 +193,13 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
 
   ir->headerlen = strlen(DPKG_AR_MAGIC) +
                   sizeof(arh) + thisilen + (thisilen & 1) + sizeof(arh);
-    
+
   return ir;
-}  
+}
 
 void mustgetpartinfo(const char *filename, struct partinfo *ri) {
   FILE *part;
-  
+
   part= fopen(filename,"r");
   if (!part) ohshite(_("cannot open archive part file `%.250s'"),filename);
   if (!read_info(part,filename,ri))
@@ -241,7 +241,7 @@ void do_info(const char *const *argv) {
   if (!*argv)
     badusage(_("--%s requires one or more part file arguments"),
              cipaction->olong);
-  
+
   while ((thisarg= *argv++)) {
     part= fopen(thisarg,"r");
     if (!part) ohshite(_("cannot open archive part file `%.250s'"),thisarg);

dpkg-split/join.c

@@ -46,7 +46,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
             "Putting package %s together from %d parts: ",
             partlist[0]->maxpartn),
          partlist[0]->package,partlist[0]->maxpartn);
-  
+
   buffersize= partlist[0]->maxpartlen;
   for (i=0; i<partlist[0]->maxpartn; i++)
     if (partlist[0]->headerlen > buffersize) buffersize= partlist[0]->headerlen;
@@ -84,7 +84,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
 void addtopartlist(struct partinfo **partlist,
                    struct partinfo *pi, struct partinfo *refi) {
   int i;
-  
+
   if (strcmp(pi->package,refi->package) ||
       strcmp(pi->version,refi->version) ||
       strcmp(pi->md5sum,refi->md5sum) ||
@@ -109,7 +109,7 @@ void do_join(const char *const *argv) {
   struct partqueue *pq;
   struct partinfo *refi, *pi, **partlist;
   unsigned int i;
-  
+
   assert(!queue);
   if (!*argv)
     badusage(_("--%s requires one or more part file arguments"),
@@ -118,8 +118,7 @@ void do_join(const char *const *argv) {
     pq= nfmalloc(sizeof(struct partqueue));
 
     mustgetpartinfo(thisarg,&pq->info);
-    
-    
+
     pq->nextinqueue= queue;
     queue= pq;
   }

dpkg-split/main.c

@@ -174,7 +174,7 @@ int main(int argc, const char *const *argv) {
   action(argv);
 
   m_output(stderr, _("<standard error>"));
-  
+
   standard_shutdown();
   exit(0);
 }

dpkg-split/queue.c

@@ -238,7 +238,7 @@ void do_queue(const char *const *argv) {
     }
   }
   if (!*head) putchar('\n');
-  
+
   head= N_("Packages not yet reassembled:\n");
   for (pq= queue; pq; pq= pq->nextinqueue) {
     if (!pq->info.md5sum) continue;

dselect/basecmds.cc

@@ -78,10 +78,10 @@ void baselist::kd_bottom() {
 void baselist::kd_redraw() {
 //#define RFSH(x) werase(x); redrawwin(x)
 //  RFSH(listpad);
-//  RFSH(infopad); 
-//  RFSH(colheadspad); 
-//  RFSH(thisstatepad); 
-//  RFSH(titlewin); 
+//  RFSH(infopad);
+//  RFSH(colheadspad);
+//  RFSH(thisstatepad);
+//  RFSH(titlewin);
 //  RFSH(whatinfowin); /* FIXME: why does ncurses need this? */
   clearok(curscr,TRUE);
   redrawall();
@@ -160,7 +160,7 @@ void baselist::displayerror(const char* str) {
 
 void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) {
   int maxx, maxy, i, y, x, nextkey;
-  
+
   getmaxyx(stdscr,maxy,maxx);
   wbkgdset(stdscr, ' ' | helpscreen_attr);
   clearok(stdscr,TRUE);
@@ -219,7 +219,7 @@ _("Press ? for help menu, . for next topic, <space> to exit help."));
   redrawthisstate();
   refreshinfo();
   wnoutrefresh(whatinfowin);
-}     
+}
 
 void baselist::kd_help() {
   displayhelp(helpmenulist(),0);
@@ -251,7 +251,7 @@ void baselist::kd_down() {
   if (cursorline+1 < nitems) ncursor++;
   setcursor(ncursor);
 }
-  
+
 void baselist::kd_up() {
   int ncursor= cursorline;
   // scroll by one line if there are any lines not shown yet

dselect/baselist.cc

@@ -63,17 +63,17 @@ void baselist::sigwinchhandler(int) {
 static void cu_sigwinch(int, void **argv) {
   struct sigaction *osigactp= (struct sigaction*)argv[0];
   sigset_t *oblockedp= (sigset_t*)argv[1];
-  
+
   if (sigaction(SIGWINCH,osigactp,0)) ohshite(_("failed to restore old SIGWINCH sigact"));
   delete osigactp;
   if (sigprocmask(SIG_SETMASK,oblockedp,0)) ohshite(_("failed to restore old signal mask"));
   delete oblockedp;
-} 
+}
 
 void baselist::setupsigwinch() {
   sigemptyset(&sigwinchset);
   sigaddset(&sigwinchset,SIGWINCH);
-    
+
   osigactp= new(struct sigaction);
   oblockedp= new(sigset_t);
   if (sigprocmask(0,0,oblockedp)) ohshite(_("failed to get old signal mask"));
@@ -162,22 +162,22 @@ void baselist::startdisplay() {
 
   setheights();
   setwidths();
-  
+
   titlewin= newwin(1,xmax, 0,0);
   if (!titlewin) ohshite(_("failed to create title window"));
   wattrset(titlewin,title_attr);
-  
+
   whatinfowin= newwin(1,xmax, whatinfo_row,0);
   if (!whatinfowin) ohshite(_("failed to create whatinfo window"));
   wattrset(whatinfowin,whatinfo_attr);
-  
+
   listpad = newpad(ymax, total_width);
   if (!listpad) ohshite(_("failed to create baselist pad"));
-  
+
   colheadspad= newpad(1, total_width);
   if (!colheadspad) ohshite(_("failed to create heading pad"));
   wattrset(colheadspad,colheads_attr);
-  
+
   thisstatepad= newpad(1, total_width);
   if (!thisstatepad) ohshite(_("failed to create thisstate pad"));
   wattrset(thisstatepad,thisstate_attr);
@@ -218,8 +218,8 @@ void baselist::startdisplay() {
 void baselist::enddisplay() {
   delwin(titlewin);
   delwin(whatinfowin);
-  delwin(listpad);  
-  delwin(colheadspad);  
+  delwin(listpad);
+  delwin(colheadspad);
   delwin(thisstatepad);
   delwin(infopad);
   wmove(stdscr,ymax,0); wclrtoeol(stdscr);
@@ -254,11 +254,11 @@ baselist::baselist(keybindings *kb) {
   showinfo= 1;
 
   searchstring[0]= 0;
-}  
+}
 
 void baselist::itd_keys() {
   whatinfovb(_("Keybindings"));
-  
+
   const int givek= xmax/3;
   bindings->describestart();
   const char **ta;
@@ -300,7 +300,7 @@ void baselist::refreshinfo() {
   pnoutrefresh(infopad, infotopofscreen,leftofscreen, info_row,0,
                min(info_row + info_height - 1, info_row + MAX_DISPLAY_INFO - 1),
                min(total_width - leftofscreen - 1, xmax - 1));
-  
+
   if (whatinfo_height) {
     mywerase(whatinfowin);
     mvwaddstr(whatinfowin,0,0, whatinfovb.string());

dselect/bindings.cc

@@ -44,13 +44,13 @@ keybindings::bind(int key, const char *action)
 {
   if (key == -1)
     return false;
-  
+
   const interpretation *interp = interps;
   while (interp->action && strcmp(interp->action, action))
     interp++;
   if (!interp->action)
     return false;
-  
+
   const description *desc = descriptions;
   while (desc->action && strcmp(desc->action, action))
    desc++;
@@ -58,7 +58,7 @@ keybindings::bind(int key, const char *action)
   binding *b = bindings;
   while (b && b->key != key)
     b = b->next;
-  
+
   if (!b) {
     b = new binding;
     b->key = key;
@@ -169,7 +169,7 @@ const keybindings::description keybindings::descriptions[]= {
   { "revertsuggest",   N_("Revert to suggested state for all packages")          },
   { "revertdirect",    N_("Revert to directly requested state for all packages") },
   { "revertinstalled", N_("Revert to currently installed state for all packages") },
-  
+
   // Actions which apply only to lists of methods.
   { "select-and-quit", N_("Select currently-highlighted access method")          },
   { "abort",           N_("Quit without changing selected access method")        },

dselect/bindings.h

@@ -28,12 +28,12 @@ struct keybindings {
     int key;
     const char *action;
   };
-  
+
   struct keyname {
     int key;
     const char *kname;
   };
-  
+
   struct description {
     const char *action, *desc;
   };
@@ -44,7 +44,7 @@ struct keybindings {
     const struct interpretation *interp;
     const char *desc;
   };
-  
+
  private:
   static const keyname keynames[];
   static const description descriptions[];
@@ -52,13 +52,13 @@ struct keybindings {
   binding *bindings;
   const description *iterate;
   const interpretation *interps;
-  
+
   bool bind(int key, const char *action);
-  
+
  public:
   int name2key(const char *name);
   const char *key2name(int key);
-  
+
   bool bind(const char *name, const char *action)
   { return bind(name2key(name), action); }
   const interpretation *operator()(int key);

dselect/dselect-curses.h

@@ -36,4 +36,3 @@
 #endif
 
 #endif /* DSELECT_CURSES_H */
-

dselect/dselect.h

@@ -57,7 +57,7 @@ protected:
   int helpscreen_attr;
 
   int total_width;
-  
+
   // (n)curses stuff
   WINDOW *listpad, *infopad, *colheadspad, *thisstatepad;
   WINDOW *titlewin, *whatinfowin, *querywin;
@@ -106,7 +106,7 @@ protected:
   virtual bool checksearch(char *str);
   virtual bool matchsearch(int index);
   void wordwrapinfo(int offset, const char *string);
-  
+
 public:
 
   keybindings *bindings;

dselect/main.cc

@@ -378,7 +378,7 @@ dme(int i, int so)
           so ? '*' : ' ', i,
           gettext(me->option),
           gettext(me->menuent));
-  
+
   int y,x;
   getmaxyx(stdscr,y,x);
 
@@ -446,7 +446,7 @@ urqresult urq_menu(void) {
       if(errno != 0)
         ohshite(_("failed to getch in main menu"));
       else {
-        clearok(stdscr,TRUE); clear(); refreshmenu(); dme(cursor,1); 
+        clearok(stdscr,TRUE); clear(); refreshmenu(); dme(cursor,1);
       }
     }
 
@@ -534,4 +534,3 @@ main(int, const char *const *argv)
   standard_shutdown();
   return(0);
 }
-

dselect/methkeys.cc

@@ -61,7 +61,7 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
   { 'k',            "up"             }, // vi style
 //{ 'p',            "up"             }, // no style
   { KEY_UP,         "up"             },
-  
+
   { C('f'),         "scrollon"       }, // vi style
   { 'N',            "scrollon"       },
   { KEY_NPAGE,      "scrollon"       },
@@ -74,25 +74,25 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
   { C('h'),         "scrollback"     },
   { C('n'),         "scrollon1"      },
   { C('p'),         "scrollback1"    },
-  
+
   { 't',            "top"            },
   { KEY_HOME,       "top"            },
   { 'e',            "bottom"         },
   { KEY_LL,         "bottom"         },
   { KEY_END,        "bottom"         },
-  
+
   { 'u',            "iscrollback"    },
   { 'd',            "iscrollon"      },
   { C('u'),         "iscrollback1"   },
   { C('d'),         "iscrollon1"     },
-  
+
   { 'B',            "panback"        },
   { KEY_LEFT,       "panback"        },
   { 'F',            "panon"          },
   { KEY_RIGHT,      "panon"          },
   { C('b'),         "panback1"       },
   { C('f'),         "panon1"         },
-                                      
+
   { '?',            "help"             },
   { KEY_HELP,       "help"             },
   { KEY_F(1),       "help"             },
@@ -106,6 +106,6 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
   { 'x',            "abort"            },
   { 'X',            "abort"            },
   { 'Q',            "abort"            },
-  
+
   {  -1,             0                 }
 };

dselect/methlist.cc

@@ -99,7 +99,7 @@ void methodlist::redraw1itemsel(int index, int selected) {
   wattrset(listpad, selected ? listsel_attr : list_attr);
   mvwprintw(listpad,index,name_column-1, " %-*.*s ",
             name_width, name_width, table[index]->name);
-  
+
   i= description_width;
   p= table[index]->summary ? table[index]->summary : "";
   while (i>0 && *p && *p != '\n') {
@@ -125,7 +125,7 @@ void methodlist::redrawcolheads() {
 
 methodlist::methodlist() : baselist(&methodlistbindings) {
   int newcursor= -1;
-  
+
   if (debug)
     fprintf(debug,"methodlist[%p]::methodlist()\n",this);
 
@@ -158,7 +158,7 @@ quitaction methodlist::display() {
 
   setupsigwinch();
   startdisplay();
-  
+
   if (debug) fprintf(debug,"methodlist[%p]::display() entering loop\n",this);
   for (;;) {
     if (whatinfo_height) wcursyncup(whatinfowin);
@@ -180,7 +180,7 @@ quitaction methodlist::display() {
   }
   pop_cleanup(ehflag_normaltidy); // unset the SIGWINCH handler
   enddisplay();
-  
+
   if (debug) fprintf(debug,"methodlist[%p]::display() done\n",this);
 
   return interp->qa;
@@ -205,7 +205,7 @@ void methodlist::redrawinfo() {
   if (!info_height) return;
   whatinfovb.reset();
   werase(infopad); wmove(infopad,0,0);
-  
+
   if (debug) fprintf(debug,"methodlist[%p]::redrawinfo()\n", this);
 
   itd_description();

dselect/method.cc

@@ -52,7 +52,7 @@ static const char *const methoddirectories[]= {
   LIBDIR "/" METHODSDIR,
   LOCALLIBDIR "/" METHODSDIR,
   0
-};    
+};
 
 static char *methodlockfile= 0;
 static int methlockfd= -1;
@@ -141,7 +141,7 @@ falliblesubprocess(struct command *cmd)
 {
   pid_t c1;
   int status, i, c;
-  
+
   cursesoff();
 
   subproc_signals_setup(cmd->name);
@@ -270,7 +270,7 @@ urqresult urq_setup(void) {
   } else {
     ur= urqr_fail;
   }
-  
+
   pop_cleanup(ehflag_normaltidy);
   return ur;
 }

dselect/method.h

@@ -59,10 +59,10 @@ protected:
 
   // Misc.
   char searchstring[50];
-  
+
   // Information displays
   void itd_description();
-  
+
   // Define these virtuals
   void redraw1itemsel(int index, int selected);
   void redrawcolheads();
@@ -78,7 +78,7 @@ protected:
   // Keybinding functions */
   void kd_quit();
   void kd_abort();
-  
+
   methodlist();
   quitaction display();
   ~methodlist();

dselect/methods/disk/setup

@@ -577,5 +577,3 @@ outputparam p_lcl_binary "$lcl_binary"
 mv shvar.$option.new shvar.$option
 
 xit=0
-
-

dselect/methods/disk/update

@@ -87,4 +87,3 @@ echo -n 'Update OK.  Hit RETURN.  '
 read response
 
 xit=0
-

dselect/methods/ftp/names

@@ -1,2 +1 @@
 60 ftp Install using ftp.
-

dselect/methparse.cc

@@ -91,7 +91,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
   }
 
   if (debug) fprintf(debug,"readmethods(`%s',...) directory open\n", pathbase);
-  
+
   while ((dent= readdir(dir)) != 0) {
     c= dent->d_name[0];
     if (debug) fprintf(debug,"readmethods(`%s',...) considering `%s' ...\n",
@@ -106,7 +106,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
       ohshit(_("method `%.250s' has name that is too long (%d > %d characters)"),
              dent->d_name, methodlen, IMETHODMAXLEN);
     /* Check if there is a localized version of this method */
-    
+
     strcpy(pathmeth, dent->d_name);
     strcpy(pathmeth+methodlen, "/");
     pathinmeth= pathmeth+methodlen+1;
@@ -137,7 +137,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
     if (debug) fprintf(debug," readmethods(`%s',...) new method"
                        " name=`%s' path=`%s' pathinmeth=`%s'\n",
                        pathbase, meth->name, meth->path, meth->pathinmeth);
-    
+
     while ((c= fgetc(names)) != EOF) {
       if (isspace(c)) continue;
       opt= new dselect_option;
@@ -181,7 +181,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
       } while (c != '\n');
       opt->summary= new char[strlen(vb.string())+1];
       strcpy(opt->summary,vb.string());
-      
+
       strcpy(pathinmeth,OPTIONSDESCPFX);
       strcpy(pathinmeth+sizeof(OPTIONSDESCPFX)-1,opt->name);
       descfile= fopen(pathbuf,"r");
@@ -202,7 +202,7 @@ void readmethods(const char *pathbase, dselect_option **optionspp, int *nread) {
         fclose(descfile);
       }
       strcpy(pathinmeth,METHODOPTIONSFILE);
-      
+
       if (debug) fprintf(debug," readmethods(`%s',...) new option"
                          " index=`%s' name=`%s' summary=`%.20s'"
                          " strlen(description=%s)=%ld"
@@ -237,7 +237,7 @@ void getcurrentopt() {
   int l;
   int admindirlen;
   char *p;
-  
+
   if (!methoptfile) {
     admindirlen= strlen(admindir);
     methoptfile= new char[admindirlen + sizeof(CMETHOPTFILE) + 2];

dselect/pkgcmds.cc

@@ -145,7 +145,7 @@ int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) {
   /* Returns: 1 for yes, 0 for no, -1 for if they want to preserve an error condition. */
   if (debug) fprintf(debug,"would_like_to_install(%d, %s) status %d\n",
                      wantvalue,pkg->name,pkg->status);
-  
+
   if (wantvalue == pkginfo::want_install) return 1;
   if (wantvalue != pkginfo::want_hold) return 0;
   if (pkg->status == pkginfo::stat_installed) return 1;
@@ -153,7 +153,7 @@ int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) {
       pkg->status == pkginfo::stat_configfiles) return 0;
   return -1;
 }
-  
+
 const char *packagelist::itemname(int index) {
   return table[index]->pkg->name;
 }

dselect/pkgdepcon.cc

@@ -56,10 +56,10 @@ pkginfoperfile *packagelist::findinfo(pkginfo *pkg) {
 
   return r;
 }
-  
+
 int packagelist::checkdependers(pkginfo *pkg, int changemade) {
   struct deppossi *possi;
-  
+
   for (possi = pkg->available.depended; possi; possi = possi->rev_next) {
     if (!useavailable(possi->up->up))
       continue;
@@ -119,7 +119,7 @@ int packagelist::resolvesuggest() {
 static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *trythis) {
   // There's no point trying to select a pure virtual package.
   if (!trythis->clientdata) return 0;
-  
+
   if (depdebug && debug)
     fprintf(debug,"update_best_to_change(best=%s{%d}, test=%s{%d});\n",
             best ? best->pkg->name : "", best ? (int)best->spriority : -1,
@@ -139,7 +139,7 @@ static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *tryt
   if (pkg_is_informative(trythis, &trythis->available) &&
       !pkg_is_informative(best->pkg, &best->pkg->available))
     goto yes;
-  
+
   // Select the package with the lowest priority (ie, the one of whom
   // we were least sure we wanted it deselected).
   if (trythis->clientdata->spriority > best->spriority) return 0;
@@ -151,7 +151,7 @@ static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *tryt
 
   // If we're still unsure we'll change the first one in the list.
   return 0;
-  
+
  yes:
   if (depdebug && debug) fprintf(debug,"update_best_to_change(); yes\n");
 
@@ -166,16 +166,16 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep)
 
   if (!er || !would_like_to_install(er->selected,per) ||
       !ed || !would_like_to_install(ed->selected,ped)) return 0;
-  
+
   add(dep, dp_must);
 
   er= per->clientdata;  // these can be changed by add
   ed= ped->clientdata;
-  
+
   if (depdebug && debug)
     fprintf(debug,"packagelist[%p]::deselect_one_of(): er %s{%d} ed %s{%d} [%p]\n",
             this, er->pkg->name, er->spriority, ed->pkg->name, ed->spriority, dep);
-  
+
   perpackagestate *best;
 
   // Try not keep packages needing reinstallation.
@@ -221,7 +221,7 @@ int packagelist::resolvedepcon(dependency *depends) {
             ? wantstrings[depends->up->clientdata->suggested]
             : "(no clientdata)");
   }
-  
+
   if (!depends->up->clientdata) return 0;
 
   switch (depends->type) {
@@ -239,7 +239,7 @@ int packagelist::resolvedepcon(dependency *depends) {
       return 0;
 
     fixbyupgrade= 0;
-    
+
     possi = depends->list;
     while (possi && !deppossatisfied(possi, &fixbyupgrade))
       possi = possi->next;
@@ -255,7 +255,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     case dep_suggests:
     	r= add(depends, dp_may);
 	return r;
-    case dep_recommends: 
+    case dep_recommends:
     	r= add(depends, dp_should);
 	break;
     default:
@@ -300,7 +300,7 @@ int packagelist::resolvedepcon(dependency *depends) {
       best->spriority= sp_selecting;
     }
     return r ? 2 : 0;
-    
+
   mustdeselect:
     best= depends->up->clientdata;
     if (depdebug && debug)
@@ -316,14 +316,14 @@ int packagelist::resolvedepcon(dependency *depends) {
       best->spriority= sp_deselecting;
     }
     return r ? 2 : 0;
-    
+
   case dep_conflicts:
   case dep_breaks:
 
     if (depdebug && debug)
       fprintf(debug,"packagelist[%p]::resolvedepcon([%p]): conflict\n",
               this,depends);
-    
+
     if (would_like_to_install(depends->up->clientdata->selected,depends->up) == 0)
       return 0;
 
@@ -350,7 +350,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     if (depdebug && debug)
       fprintf(debug,"packagelist[%p]::resolvedepcon([%p]): no desel\n", this,depends);
     return 0;
-    
+
   default:
     internerr("unknown deptype");
   }
@@ -365,14 +365,14 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
   //  restriction is violated ie that the target package is wanted
   int would;
   pkginfo::pkgwant want= pkginfo::want_purge;
-  
+
   if (possi->ed->clientdata) {
     want= possi->ed->clientdata->selected;
     would= would_like_to_install(want,possi->ed);
   } else {
     would= 0;
   }
-  
+
   if ((possi->up->type == dep_conflicts || possi->up->type == dep_breaks)
       ? possi->up->up != possi->ed && would != 0
       : would > 0) {

dselect/pkgdisplay.cc

@@ -33,10 +33,10 @@
 
 /* These MUST be in the same order as the corresponding enums in dpkg-db.h */
 const char
-  *const wantstrings[]=   { N_("new package"), 
+  *const wantstrings[]=   { N_("new package"),
 			    N_("install"),
 			    N_("hold"),
-			    N_("remove"), 
+			    N_("remove"),
 			    N_("purge"),
 			    0 },
 
@@ -44,8 +44,8 @@ const char
    * the empty string to store information about the translation. DO NOT
    * CHANGE THAT IN A TRANSLATION! The code really relies on that being
    * a single space. */
-  *const eflagstrings[]=   { N_(" "), 
-			     N_("REINSTALL"), 
+  *const eflagstrings[]=   { N_(" "),
+			     N_("REINSTALL"),
 			     0 },
 
   *const statusstrings[]= { N_("not installed"),
@@ -159,7 +159,7 @@ void packagelist::setwidths() {
   }
 
   int versiondescriptioncolumn= package_column + package_width + gap_width;
-  
+
   switch (versiondisplayopt) {
   case vdo_none:
     versioninstalled_column= versioninstalled_width= 0;
@@ -182,7 +182,7 @@ void packagelist::setwidths() {
   default:
     internerr("unknown versiondisplayopt in setwidths");
   }
-    
+
   total_width= TOTAL_LIST_WIDTH;
   if (total_width < COLS)
     total_width= COLS;
@@ -191,7 +191,7 @@ void packagelist::setwidths() {
 
 void packagelist::redrawtitle() {
   int x,y;
-  
+
   if (title_height) {
     mywerase(titlewin);
     mvwaddnstr(titlewin,0,0,

dselect/pkginfo.cc

@@ -168,11 +168,11 @@ void packagelist::redrawinfo() {
   if (!info_height) return;
   whatinfovb.reset();
   werase(infopad); wmove(infopad,0,0);
-  
+
   if (debug)
     fprintf(debug,"packagelist[%p]::redrawinfo(); #=%d\n", this,
             (int)(currentinfo - baseinfo));
-  
+
   (this->*currentinfo->display)();
   whatinfovb.terminate();
   int y,x;

dselect/pkgkeys.cc

@@ -77,7 +77,7 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
   { 'k',            "up"               }, // vi style
   { 'p',            "up"               },
   { KEY_UP,         "up"               },
-                                       
+
   { 'N',            "scrollon"         },
   { KEY_NPAGE,      "scrollon"         },
   { ' ',            "scrollon"         },
@@ -88,25 +88,25 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
   { C('h'),         "scrollback"       },
   { C('n'),         "scrollon1"        },
   { C('p'),         "scrollback1"      },
-                                       
+
   { 't',            "top"              },
   { KEY_HOME,       "top"              },
   { 'e',            "bottom"           },
   { KEY_LL,         "bottom"           },
   { KEY_END,        "bottom"           },
-                                       
+
   { 'u',            "iscrollback"      },
   { 'd',            "iscrollon"        },
   { C('u'),         "iscrollback1"     },
   { C('d'),         "iscrollon1"       },
-                                       
+
   { 'B',            "panback"          },
   { KEY_LEFT,       "panback"          },
   { 'F',            "panon"            },
   { KEY_RIGHT,      "panon"            },
   { C('b'),         "panback1"         },
   { C('f'),         "panon1"           },
-                                       
+
   { '+',            "install"          },
   { KEY_IC,         "install"          },
   { '-',            "remove"           },
@@ -115,7 +115,7 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
   { 'H',            "hold"             },
   { '=',            "hold"             },
   { 'G',            "unhold"           },
-                                       
+
   { '?',            "help"             },
   { KEY_HELP,       "help"             },
   { KEY_F(1),       "help"             },
@@ -129,7 +129,7 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
   { '/',            "search"           },
   { 'n',            "searchagain"      },
   { '\\',           "searchagain"      },
-                                       
+
   { KEY_ENTER,      "quitcheck"        },
   { '\r',           "quitcheck"        },
   { 'Q',            "quitnocheck"      },
@@ -139,6 +139,6 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
   { 'U',            "revertsuggest"    },
   { 'D',            "revertdirect"     },
   { 'C',            "revertinstalled"  },
-                                       
+
   {  -1,             0                 }
 };

dselect/pkglist.cc

@@ -117,7 +117,7 @@ void packagelist::addheading(enum ssavailval ssavail,
     delete[] table;
     table= newtable;
   }
-  
+
   if (debug) fprintf(debug,"packagelist[%p]::addheading(%d,%d,%d,%s,%s)\n",
                      this,ssavail,ssstate,priority,
                      otherpriority ? otherpriority : "<null>",
@@ -136,7 +136,7 @@ void packagelist::addheading(enum ssavailval ssavail,
   newstate->ssavail= ssavail;
   newstate->ssstate= ssstate;
   newhead->clientdata= newstate;
- 
+
   table[nitems++]= newstate;
 }
 
@@ -159,10 +159,10 @@ void packagelist::ensurestatsortinfo() {
   const struct versionrevision *vera;
   struct pkginfo *pkg;
   int index;
-  
+
   if (debug) fprintf(debug,"packagelist[%p]::ensurestatsortinfos() "
                      "sortorder=%d nitems=%d\n",this,statsortorder,nitems);
-  
+
   switch (statsortorder) {
   case sso_unsorted:
     if (debug) fprintf(debug,"packagelist[%p]::ensurestatsortinfos() unsorted\n",this);
@@ -215,7 +215,6 @@ void packagelist::ensurestatsortinfo() {
       if (debug)
         fprintf(debug,"packagelist[%p]::ensurestatsortinfos() i=%d ssavail=%d\n",
                 this,index,table[index]->ssavail);
-  
     }
     calcssadone= 1;
     break;
@@ -250,7 +249,6 @@ void packagelist::ensurestatsortinfo() {
       if (debug)
         fprintf(debug,"packagelist[%p]::ensurestatsortinfos() i=%d ssstate=%d\n",
                 this,index,table[index]->ssstate);
-  
     }
     calcsssdone= 1;
     break;
@@ -267,7 +265,7 @@ void packagelist::sortmakeheads() {
 
   if (debug) fprintf(debug,"packagelist[%p]::sortmakeheads() "
                      "sortorder=%d statsortorder=%d\n",this,sortorder,statsortorder);
-  
+
   int nrealitems= nitems;
   addheading(ssa_none,sss_none,pkginfo::pri_unset,0,0);
 
@@ -276,7 +274,7 @@ void packagelist::sortmakeheads() {
 
   // Important: do not save pointers into table in this function, because
   // addheading may need to reallocate table to make it larger !
-  
+
   struct pkginfo *lastpkg;
   struct pkginfo *thispkg;
   lastpkg= 0;
@@ -301,7 +299,7 @@ void packagelist::sortmakeheads() {
     default:
       internerr("unknown statsortorder in sortmakeheads");
     }
-    
+
     int prioritydiff= (!lastpkg ||
                        thispkg->priority != lastpkg->priority ||
                        (thispkg->priority == pkginfo::pri_other &&
@@ -328,27 +326,27 @@ void packagelist::sortmakeheads() {
     if (ssdiff)
       addheading(ssavail,ssstate,
                  pkginfo::pri_unset,0, 0);
-    
+
     if (sortorder == so_section && sectiondiff)
       addheading(ssavail,ssstate,
                  pkginfo::pri_unset,0, thispkg->section ? thispkg->section : "");
-    
+
     if (sortorder == so_priority && prioritydiff)
       addheading(ssavail,ssstate,
                  thispkg->priority,thispkg->otherpriority, 0);
-    
+
     if (sortorder != so_alpha && (prioritydiff || sectiondiff))
       addheading(ssavail,ssstate,
                  thispkg->priority,thispkg->otherpriority,
                  thispkg->section ? thispkg->section : "");
-    
+
     lastpkg= thispkg;
   }
 
   if (listpad) {
     werase(listpad);
   }
-  
+
   sortinplace();
 }
 
@@ -384,7 +382,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
   initialsetup();
   struct pkgiterator *iter;
   struct pkginfo *pkg;
-  
+
   nitems = 0;
 
   iter = pkg_db_iter_new();
@@ -431,14 +429,14 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
 packagelist::packagelist(keybindings *kb, pkginfo **pkgltab) : baselist(kb) {
   // takes over responsibility for pkgltab (recursive)
   initialsetup();
-  
+
   recursive= 1;
   nitems= 0;
   if (pkgltab) {
     add(pkgltab);
     delete[] pkgltab;
   }
-    
+
   sortorder= so_unsorted;
   statsortorder= sso_unsorted;
   versiondisplayopt= vdo_none;
@@ -472,19 +470,19 @@ packagelist::~packagelist() {
     regfree(&searchfsm);
 
   discardheadings();
-  
+
   int index;
   for (index=0; index<nitems; index++) table[index]->free(recursive);
   delete[] table;
   delete[] datatable;
   if (debug) fprintf(debug,"packagelist[%p]::~packagelist() tables freed\n",this);
-  
+
   doneent *search, *next;
   for (search=depsdone; search; search=next) {
     next= search->next;
     delete search;
   }
-  
+
   if (debug) fprintf(debug,"packagelist[%p]::~packagelist() done\n",this);
 }
 
@@ -527,7 +525,7 @@ packagelist::checksearch(char *rx)
     displayerror(_("error in regular expression"));
     return false;
   }
-  
+
   return true;
 }
 
@@ -596,12 +594,12 @@ pkginfo **packagelist::display() {
   }
   pop_cleanup(ehflag_normaltidy); // unset the SIGWINCH handler
   enddisplay();
-  
+
   if (interp->qa == qa_quitnochecksave || !readwrite) {
     if (debug) fprintf(debug,"packagelist[%p]::display() done - quitNOcheck\n",this);
     return 0;
   }
-  
+
   if (recursive) {
     retl= new pkginfo*[nitems+1];
     for (index=0; index<nitems; index++) retl[index]= table[index]->pkg;

dselect/pkglist.h

@@ -128,14 +128,14 @@ protected:
   void itd_description();
   void itd_statuscontrol();
   void itd_availablecontrol();
-  
+
   // Dependency and sublist processing
   struct doneent { doneent *next; void *dep; } *depsdone, *unavdone;
   bool alreadydone(doneent **, void *);
   int resolvedepcon(dependency*);
   int checkdependers(pkginfo*, int changemade); // returns new changemade
   int deselect_one_of(pkginfo *er, pkginfo *ed, dependency *dep);
-  
+
   // Define these virtuals
   bool checksearch(char *str);
   bool matchsearch(int index);
@@ -149,7 +149,7 @@ protected:
   const struct helpmenuentry *helpmenulist();
 
   // Miscellaneous internal routines
-  
+
   void redraw1package(int index, int selected);
   int compareentries(const struct perpackagestate *a, const struct perpackagestate *b);
   friend int qsort_compareentries(const void *a, const void *b);
@@ -174,14 +174,14 @@ protected:
   void affectedrange(int *startp, int *endp);
   void setwant(pkginfo::pkgwant nw);
   void sethold(int hold);
-  
+
  public:
 
   // Keybinding functions */
   void kd_quit_noop();
   void kd_revert_abort();
   void kd_revertsuggest();
-  void kd_revertdirect();  
+  void kd_revertdirect();
   void kd_revertinstalled();
   void kd_morespecific();
   void kd_lessspecific();
@@ -196,7 +196,7 @@ protected:
   void kd_toggleinfo();
   void kd_verbose();
   void kd_versiondisplay();
-  
+
   packagelist(keybindings *kb); // nonrecursive
   packagelist(keybindings *kb, pkginfo **pkgltab); // recursive
   void add(pkginfo **arry) { while (*arry) add(*arry++); }

dselect/pkgsublist.cc

@@ -49,7 +49,7 @@ void packagelist::add(pkginfo *pkg) {
   pkg->clientdata= state;
   table[nitems]= state;
   nitems++;
-}   
+}
 
 void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) {
   if (debug) fprintf(debug,"packagelist[%p]::add(pkginfo %s, %s)\n",
@@ -63,8 +63,7 @@ void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) {
                      this, pkg->name, wantstrings[nw]);
   pkg->clientdata->suggested= pkg->clientdata->selected= nw;
   pkg->clientdata->spriority= np;
-    
-}   
+}
 
 void packagelist::add(pkginfo *pkg, const char *extrainfo, showpriority showimp) {
   if (debug)
@@ -74,13 +73,13 @@ void packagelist::add(pkginfo *pkg, const char *extrainfo, showpriority showimp)
   if (pkg->clientdata->dpriority < showimp) pkg->clientdata->dpriority= showimp;
   pkg->clientdata->relations(extrainfo);
   pkg->clientdata->relations.terminate();
-}   
+}
 
 bool
 packagelist::alreadydone(doneent **done, void *check)
 {
   doneent *search = *done;
-  
+
   while (search && search->dep != check)
     search = search->next;
   if (search)
@@ -115,7 +114,7 @@ packagelist::add(dependency *depends, showpriority displayimportance)
 
   if (alreadydone(&depsdone, depends))
     return false;
-  
+
   const char *comma= "";
   varbuf info;
   info(depends->up->name);
@@ -166,7 +165,7 @@ void repeatedlydisplay(packagelist *sub,
                        packagelist *unredisplay) {
   pkginfo **newl;
   keybindings *kb;
-  
+
   if (debug) fprintf(debug,"repeatedlydisplay(packagelist[%p])\n",sub);
   if (sub->resolvesuggest() != 0 && sub->deletelessimp_anyleft(initial)) {
     if (debug) fprintf(debug,"repeatedlydisplay(packagelist[%p]) once\n",sub);

dselect/pkgtop.cc

@@ -73,7 +73,7 @@ int packagelist::describemany(char buf[], const char *prioritystring,
   default:
     internerr("unknown statsortrder in describemany all");
   }
-  
+
   if (!prioritystring) {
     if (!section) {
       strcpy(buf, ssostring ? gettext(ssostring) : _("All packages"));
@@ -112,7 +112,7 @@ void packagelist::redrawthisstate() {
                            strlen(table[cursorline]->pkg->name) : 0),
                           (section ? strlen(section) : 0) +
                           (priority ? strlen(priority) : 0))];
-    
+
   if (table[cursorline]->pkg->name) {
     sprintf(buf,
             _("%-*s %s%s%s;  %s (was: %s).  %s"),
@@ -145,9 +145,7 @@ void packagelist::redraw1itemsel(int index, int selected) {
   wattrset(listpad, selected ? listsel_attr : list_attr);
 
   if (pkg->name) {
-
     if (verbose) {
-
       mvwprintw(listpad, screenline, 0, "%-*.*s ",
                 status_hold_width, status_hold_width,
                 gettext(eflagstrings[pkg->eflag]));
@@ -165,25 +163,23 @@ void packagelist::redraw1itemsel(int index, int selected) {
               gettext(wantstrings[table[index]->selected]));
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad, ' ');
-  
+
       mvwprintw(listpad, screenline, priority_column - 1, " %-*.*s",
                 priority_width, priority_width,
                 pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
                 gettext(prioritystrings[pkg->priority]));
-
     } else {
-
       mvwaddch(listpad, screenline, 0, eflagchars[pkg->eflag]);
       waddch(listpad, statuschars[pkg->status]);
       waddch(listpad,
              /* FIXME: keep this feature? */
              /*table[index]->original == table[index]->selected ? ' '
              : */wantchars[table[index]->original]);
-    
+
       wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
       waddch(listpad, wantchars[table[index]->selected]);
       wattrset(listpad, selected ? listsel_attr : list_attr);
-      
+
       wmove(listpad, screenline, priority_column - 1);
       waddch(listpad, ' ');
       if (pkg->priority == pkginfo::pri_other) {
@@ -196,13 +192,12 @@ void packagelist::redraw1itemsel(int index, int selected) {
         wprintw(listpad, "%-*.*s", priority_width, priority_width,
                 gettext(priorityabbrevs[pkg->priority]));
       }
-
     }
 
     mvwprintw(listpad, screenline, section_column - 1, " %-*.*s",
               section_width, section_width,
               pkg->section ? pkg->section : "?");
-  
+
     mvwprintw(listpad, screenline, package_column - 1, " %-*.*s ",
               package_width, package_width, pkg->name);
 
@@ -225,16 +220,14 @@ void packagelist::redraw1itemsel(int index, int selected) {
     p= info->description ? info->description :
        pkg->installed.description ? pkg->installed.description : "";
     while (i>0 && *p && *p != '\n') { waddnstr(listpad,p,1); i--; p++; }
-      
   } else {
-
     const char *section= pkg->section;
     const char *priority= pkgprioritystring(pkg);
 
     char *buf= new char[500+
                         (section ? strlen(section) : 0) +
                         (priority ? strlen(priority) : 0)];
-    
+
     indent= describemany(buf,priority,section,pkg->clientdata);
 
     mvwaddstr(listpad, screenline, 0, "    ");
@@ -253,7 +246,6 @@ void packagelist::redraw1itemsel(int index, int selected) {
     while (j-- >0) { waddch(listpad,ACS_HLINE); i--; }
 
     delete[] buf;
-
   }
 
   while (i>0) { waddch(listpad,' '); i--; }

dselect/po/ChangeLog.old

@@ -370,4 +370,3 @@
 	* vi.po: Likewise.
 	* zh_CN.po: Likewise.
 	* zh_TW.po: Likewise.
-

dselect/po/POTFILES.in

@@ -19,4 +19,3 @@ dselect/pkgkeys.cc
 dselect/pkglist.cc
 dselect/pkgsublist.cc
 dselect/pkgtop.cc
-

get-version

@@ -38,4 +38,3 @@ fi
 
 # Use printf to avoid the trailing new line that m4_esyscmd would not handle.
 printf "$version"
-

lib/compat/Makefile.am

@@ -55,4 +55,3 @@ endif
 if !HAVE_UNSETENV
 libcompat_a_SOURCES += unsetenv.c
 endif
-

lib/compat/alphasort.c

@@ -31,4 +31,3 @@ alphasort(const void *a, const void *b)
 
 }
 #endif
-

lib/compat/compat.h

@@ -92,4 +92,3 @@ int unsetenv(const char *x);
 #endif
 
 #endif /* COMPAT_H */
-

lib/compat/scandir.c

@@ -98,4 +98,3 @@ scandir(const char *dir, struct dirent ***namelist,
 	return used;
 }
 #endif
-

lib/compat/snprintf.c

@@ -38,4 +38,3 @@ snprintf(char *str, size_t n, char const *fmt, ...)
 	return i;
 }
 #endif
-

lib/compat/strerror.c

@@ -41,4 +41,3 @@ strerror(int e)
 	return buf;
 }
 #endif
-

lib/compat/strsignal.c

@@ -70,4 +70,3 @@ strsignal(int s)
 	return buf;
 }
 #endif
-

lib/compat/unsetenv.c

@@ -37,4 +37,3 @@ unsetenv(const char *p)
 	return putenv(q);
 }
 #endif
-

lib/compat/vsnprintf.c

@@ -69,4 +69,3 @@ vsnprintf(char *buf, size_t maxsize, const char *fmt, va_list args)
 	return total;
 }
 #endif
-

lib/dpkg/buffer.c

@@ -246,4 +246,3 @@ buffer_copy(struct buffer_data *read_data, struct buffer_data *write_data,
 
 	return totalread;
 }
-

lib/dpkg/cleanup.c

@@ -59,4 +59,3 @@ cu_closefd(int argc, void **argv)
 
 	close(ip);
 }
-

lib/dpkg/command.c

@@ -181,4 +181,3 @@ command_exec(struct command *cmd)
 		execvp(cmd->filename, (char * const *)cmd->argv);
 	ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename);
 }
-

lib/dpkg/command.h

@@ -51,4 +51,3 @@ void command_exec(struct command *cmd) DPKG_ATTR_NORET;
 DPKG_END_DECLS
 
 #endif /* LIBDPKG_COMMAND_H */
-

lib/dpkg/database.c

@@ -134,7 +134,7 @@ pkg_db_find(const char *inname)
 
   p= name;
   while(*p) { *p= tolower(*p); p++; }
-  
+
   pointerp= bins + (hash(name) % (BINS));
   while (*pointerp && strcasecmp((*pointerp)->name,name))
     pointerp= &(*pointerp)->next;

lib/dpkg/dbmodify.c

@@ -83,7 +83,6 @@ static void cleanupdates(void) {
   if (cdn == -1) ohshite(_("cannot scan updates directory `%.255s'"),updatefnbuf);
 
   if (cdn) {
-    
     for (i=0; i<cdn; i++) {
       strcpy(updatefnrest, cdlist[i]->d_name);
       parsedb(updatefnbuf, pdb_lax_parser | pdb_weakclassification,
@@ -93,7 +92,7 @@ static void cleanupdates(void) {
 
     if (cstatus >= msdbrw_write) {
       writedb(statusfile,0,1);
-    
+
       for (i=0; i<cdn; i++) {
         strcpy(updatefnrest, cdlist[i]->d_name);
         if (unlink(updatefnbuf))
@@ -103,7 +102,6 @@ static void cleanupdates(void) {
 
       dir_sync_path(updatesdir);
     }
-    
   }
   free(cdlist);
 
@@ -112,9 +110,9 @@ static void cleanupdates(void) {
 
 static void createimptmp(void) {
   int i;
-  
+
   onerr_abort++;
-  
+
   importanttmp= fopen(importanttmpfile,"w");
   if (!importanttmp)
     ohshite(_("unable to create `%.255s'"), importanttmpfile);
@@ -209,7 +207,7 @@ enum modstatdb_rw
 modstatdb_init(const char *admindir, enum modstatdb_rw readwritereq)
 {
   const struct fni *fnip;
-  
+
   for (fnip=fnis; fnip->suffix; fnip++) {
     free(*fnip->store);
     *fnip->store = m_malloc(strlen(admindir) + strlen(fnip->suffix) + 2);
@@ -273,7 +271,7 @@ void modstatdb_checkpoint(void) {
 
   assert(cstatus >= msdbrw_write);
   writedb(statusfile,0,1);
-  
+
   for (i=0; i<nextupdate; i++) {
     sprintf(updatefnrest, IMPORTANTFMT, i);
     /* Have we made a real mess? */
@@ -415,4 +413,3 @@ const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
   varbufaddc(&vb,0);
   return vb.buf;
 }
-

lib/dpkg/dpkg-db.h

@@ -36,7 +36,7 @@ struct versionrevision {
   unsigned long epoch;
   const char *version;
   const char *revision;
-};  
+};
 
 enum deptype {
   dep_suggests,
@@ -202,6 +202,7 @@ enum modstatdb_rw {
   msdbrw_readonly/*s*/, msdbrw_needsuperuserlockonly/*s*/,
   msdbrw_writeifposs,
   msdbrw_write/*s*/, msdbrw_needsuperuser,
+
   /* Now some optional flags: */
   msdbrw_flagsmask= ~077,
   /* Flags start at 0100. */

lib/dpkg/dump.c

@@ -116,7 +116,7 @@ void w_filecharf(struct varbuf *vb,
                  const struct pkginfo *pigp, const struct pkginfoperfile *pifp,
                  enum fwriteflags flags, const struct fieldinfo *fip) {
   struct filedetails *fdp;
-  
+
   if (pifp != &pigp->available) return;
   fdp= pigp->files;
   if (!fdp || !FILEFFIELD(fdp,fip->integer,const char*)) return;
@@ -146,7 +146,7 @@ void w_booleandefno(struct varbuf *vb,
   }
   if (!value) return;
   assert(value == true);
-  varbufaddstr(vb,fip->name); varbufaddstr(vb, ": yes\n"); 
+  varbufaddstr(vb,fip->name); varbufaddstr(vb, ": yes\n");
 }
 
 void w_priority(struct varbuf *vb,
@@ -357,7 +357,7 @@ void
 writedb(const char *filename, bool available, bool mustsync)
 {
   static char writebuf[8192];
-  
+
   struct pkgiterator *it;
   struct pkginfo *pigp;
   struct pkginfoperfile *pifp;
@@ -378,7 +378,7 @@ writedb(const char *filename, bool available, bool mustsync)
   umask(old_umask);
   if (!file)
     ohshite(_("failed to open '%s' for writing %s database"), filename, which);
-  
+
   if (setvbuf(file,writebuf,_IOFBF,sizeof(writebuf)))
     ohshite(_("unable to set buffering on %s database file"), which);
 
@@ -393,7 +393,7 @@ writedb(const char *filename, bool available, bool mustsync)
     if (fputs(vb.buf,file) < 0)
       ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"),
               which, pigp->name, filename);
-    varbufreset(&vb);      
+    varbufreset(&vb);
   }
   pkg_db_iter_free(it);
   varbuf_destroy(&vb);

lib/dpkg/ehandle.c

@@ -58,7 +58,7 @@ struct cleanup_entry {
   int cpmask, cpvalue;
   int argc;
   void *argv[1];
-};         
+};
 
 struct error_context {
   struct error_context *next;
@@ -196,7 +196,7 @@ run_cleanups(struct error_context *econ, int flagsetin)
   volatile int i, flagset;
 
   if (econ->printerror) econ->printerror(errmsg,econ->contextstring);
-     
+
   if (++preventrecurse > 3) {
     onerr_abort++;
     fprintf(stderr, _("%s: too many nested errors during error recovery!!\n"),
@@ -262,7 +262,7 @@ pop_error_context(int flagset)
 void push_checkpoint(int mask, int value) {
   struct cleanup_entry *cep;
   int i;
-  
+
   cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *));
   if (cep == NULL) {
     onerr_abort++;
@@ -285,7 +285,7 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
   va_list args;
 
   onerr_abort++;
-  
+
   cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *) * (nargs + 1));
   if (!cep) {
     if (nargs > array_count(emergency.args))
@@ -374,7 +374,7 @@ void ohshite(const char *fmt, ...) {
   va_end(args);
 
   snprintf(errmsgbuf,sizeof(errmsgbuf),"%s: %s",buf,strerror(e));
-  errmsg= errmsgbuf; 
+  errmsg= errmsgbuf;
 
   run_error_handler();
 }
@@ -417,5 +417,3 @@ do_internerr(const char *file, int line, const char *fmt, ...)
 
   abort();
 }
-
-

lib/dpkg/fields.c

@@ -161,7 +161,7 @@ void f_status(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                 _("value for `status' field not allowed in this context"));
   if (ps->flags & pdb_recordavailable)
     return;
-  
+
   pigp->want = convert_string(ps, pigp,
                               _("first (want) word in `status' field"),
                               wantinfos, value, &ep, -1);
@@ -178,7 +178,7 @@ void f_version(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                const char *value, const struct fieldinfo *fip) {
   parse_db_version(ps, pigp, &pifp->version, value,
                    _("error in Version string '%.250s'"), value);
-}  
+}
 
 void f_revision(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                 struct parsedb_state *ps,
@@ -194,7 +194,7 @@ void f_revision(struct pkginfo *pigp, struct pkginfoperfile *pifp,
     pifp->version.version= newversion;
   }
   pifp->version.revision= nfstrsave(value);
-}  
+}
 
 void f_configversion(struct pkginfo *pigp, struct pkginfoperfile *pifp,
                      struct parsedb_state *ps,
@@ -221,7 +221,7 @@ static void conffvalue_lastword(const char *value, const char *from,
                                 struct pkginfo *pigp)
 {
   const char *lastspc;
-  
+
   if (from <= value+1) goto malformed;
   for (lastspc= from-1; *lastspc != ' '; lastspc--);
   if (lastspc <= value+1 || lastspc >= endent-1) goto malformed;
@@ -245,7 +245,7 @@ void f_conffiles(struct pkginfo *pigp, struct pkginfoperfile *pifp,
   const char *endent, *endfn, *hashstart;
   int c, namelen, hashlen, obsolete;
   char *newptr;
-  
+
   lastp= &pifp->conffiles;
   while (*value) {
     c= *value++;
@@ -542,4 +542,3 @@ f_trigaw(struct pkginfo *aw, struct pkginfoperfile *pifp,
     trig_enqueue_awaited_pend(pend);
   }
 }
-

lib/dpkg/file.c

@@ -149,4 +149,3 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename,
 
 	push_cleanup(file_unlock_cleanup, ~0, NULL, 0, 2, lockfd, desc);
 }
-

lib/dpkg/file.h

@@ -51,4 +51,3 @@ void file_unlock(void);
 DPKG_END_DECLS
 
 #endif /* LIBDPKG_FILE_H */
-

lib/dpkg/log.c

@@ -103,4 +103,3 @@ statusfd_send(const char *fmt, ...)
 		}
 	}
 }
-

lib/dpkg/macros.h

@@ -84,4 +84,3 @@
 #endif
 
 #endif /* LIBDPKG_MACROS_H */
-

lib/dpkg/mlib.c

@@ -38,12 +38,12 @@ void *m_malloc(size_t amount) {
   unsigned short *r2, x;
 #endif
   void *r;
-  
+
   onerr_abort++;
   r= malloc(amount);
   if (!r) ohshite(_("malloc failed (%ld bytes)"),(long)amount);
   onerr_abort--;
-  
+
 #ifdef MDEBUG
   r2= r; x= (unsigned short)amount ^ 0xf000;
   while (amount >= 2) { *r2++= x; amount -= 2; }
@@ -76,7 +76,7 @@ m_strdup(const char *str)
 
 void m_dup2(int oldfd, int newfd) {
   const char *const stdstrings[]= { "in", "out", "err" };
-  
+
   if (dup2(oldfd,newfd) == newfd) return;
 
   onerr_abort++;
@@ -106,4 +106,3 @@ void setcloexec(int fd, const char* fn) {
   if (fcntl(fd, F_SETFD, (f|FD_CLOEXEC))==-1)
     ohshite(_("unable to set close-on-exec flag for %.250s"),fn);
 }
-

lib/dpkg/nfmalloc.c

@@ -45,7 +45,7 @@ static void nfobstack_init(void) {
   dbobs_init = true;
   obstack_chunk_size(&db_obs) = CHUNK_SIZE;
 }
-  
+
 void *
 nfmalloc(size_t size)
 {

lib/dpkg/parse.c

@@ -250,9 +250,11 @@ int parsedb(const char *filename, enum parsedbflags flags,
       }
       if (EOF_mmap(dataptr, endptr) || c == '\n' || c == MSDOS_EOF_CHAR) break;
     } /* Loop per field. */
+
     if (pdone && donep)
       parse_error(&ps, &newpig,
                   _("several package info entries found, only one allowed"));
+
     parse_must_have_field(&ps, &newpig, newpig.name, "package name");
     /* XXX: We need to check for status != stat_halfinstalled as while
      * unpacking a deselected package, it will not have yet all data in
@@ -379,7 +381,6 @@ int parsedb(const char *filename, enum parsedbflags flags,
         /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find())
          * rather than in newpig. */
       }
-
     } else if (!(flags & pdb_ignorefiles)) {
       pigp->files= newpig.files;
     }
@@ -439,7 +440,7 @@ void copy_dependency_links(struct pkginfo *pkg,
   struct dependency *dyp;
   struct deppossi *dop;
   struct pkginfoperfile *addtopifp;
-  
+
   /* Delete ‘backward’ (‘depended’) links from other packages to
    * dependencies listed in old version of this one. We do this by
    * going through all the dependencies in the old version of this
@@ -458,6 +459,7 @@ void copy_dependency_links(struct pkginfo *pkg,
         dop->rev_next->rev_prev = dop->rev_prev;
     }
   }
+
   /* Now fill in new ‘ed’ links from other packages to dependencies
    * listed in new version of this one, and set our uplinks correctly. */
   for (dyp= newdepends; dyp; dyp= dyp->next) {
@@ -471,6 +473,7 @@ void copy_dependency_links(struct pkginfo *pkg,
       addtopifp->depended= dop;
     }
   }
+
   /* Finally, we fill in the new value. */
   *updateme= newdepends;
 }

lib/dpkg/parsehelp.c

@@ -129,7 +129,7 @@ pkg_name_is_illegal(const char *p, const char **ep)
   static const char alsoallowed[] = "-+._";
   static char buf[150];
   int c;
-  
+
   if (!*p) return _("may not be empty string");
   if (!isalnum(*p)) return _("must start with an alphanumeric");
   while ((c = *p++) != '\0')
@@ -166,7 +166,7 @@ informativeversion(const struct versionrevision *version)
 void varbufversion
 (struct varbuf *vb,
  const struct versionrevision *version,
- enum versiondisplayepochwhen vdew) 
+ enum versiondisplayepochwhen vdew)
 {
   switch (vdew) {
   case vdew_never:
@@ -197,7 +197,7 @@ const char *versiondescribe
   static int bufnum=0;
 
   struct varbuf *vb;
-  
+
   if (!informativeversion(version)) return _("<none>");
 
   vb= &bufs[bufnum]; bufnum++; if (bufnum == 10) bufnum= 0;
@@ -358,4 +358,3 @@ parse_ensure_have_field(struct parsedb_state *ps,
     parse_warn(ps, pigp, _("empty value for %s"), what);
   }
 }
-

lib/dpkg/path.c

@@ -156,4 +156,3 @@ path_quote_filename(char *dst, const char *src, size_t n)
 
 	return r;
 }
-

lib/dpkg/path.h

@@ -36,4 +36,3 @@ char *path_make_temp_template(const char *suffix);
 DPKG_END_DECLS
 
 #endif /* LIBDPKG_PATH_H */
-

lib/dpkg/pkg-array.c

@@ -79,4 +79,3 @@ pkg_array_destroy(struct pkg_array *a)
 	free(a->pkgs);
 	a->pkgs = NULL;
 }
-

lib/dpkg/pkg-format.c

@@ -267,4 +267,3 @@ pkg_format_show(const struct pkg_format_node *head,
 	varbuf_destroy(&fb);
 	varbuf_destroy(&vb);
 }
-

lib/dpkg/pkg-list.c

@@ -76,4 +76,3 @@ pkg_list_prepend(struct pkg_list **head, struct pkginfo *pkg)
 {
 	*head = pkg_list_new(pkg, *head);
 }
-

lib/dpkg/pkg-queue.c

@@ -124,4 +124,3 @@ pkg_queue_pop(struct pkg_queue *queue)
 
 	return pkg;
 }
-

lib/dpkg/pkg-show.c

@@ -47,4 +47,3 @@ pkg_summary(const struct pkginfo *pkg, int *len_ret)
 
 	return pdesc;
 }
-

lib/dpkg/pkg.c

@@ -46,4 +46,3 @@ pkg_sorter_by_name(const void *a, const void *b)
 
 	return strcmp(pa->name, pb->name);
 }
-

lib/dpkg/progress.c

@@ -69,4 +69,3 @@ progress_done(struct progress *progress)
 	if (progress->on_tty)
 		printf("\r%s", progress->text);
 }
-

lib/dpkg/progress.h

@@ -44,4 +44,3 @@ void progress_done(struct progress *progress);
 DPKG_END_DECLS
 
 #endif
-

lib/dpkg/string.c

@@ -83,4 +83,3 @@ str_strip_quotes(char *str)
 
 	return str;
 }
-

lib/dpkg/string.h

@@ -31,4 +31,3 @@ char *str_strip_quotes(char *str);
 DPKG_END_DECLS
 
 #endif /* LIBDPKG_STRING_H */
-

lib/dpkg/subproc.c

@@ -161,4 +161,3 @@ subproc_wait_check(pid_t pid, const char *desc, int flags)
 
 	return subproc_check(status, desc, flags);
 }
-

lib/dpkg/subproc.h

@@ -42,4 +42,3 @@ int subproc_wait_check(pid_t pid, const char *desc, int flags);
 DPKG_END_DECLS
 
 #endif /* LIBDPKG_SUBPROC_H */
-

lib/dpkg/tarfn.c

@@ -402,4 +402,3 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 		return status;
 	}
 }
-

lib/dpkg/test.h

@@ -54,4 +54,3 @@ main(int argc, char **argv)
 #endif
 
 #endif
-

lib/dpkg/test/Makefile.am

@@ -37,4 +37,3 @@ t_varbuf_LDADD = $(CHECK_LDADD)
 t_version_LDADD = $(CHECK_LDADD)
 
 TESTS = $(check_PROGRAMS)
-

lib/dpkg/test/t-buffer.c

@@ -46,4 +46,3 @@ test(void)
 {
 	test_buffer_hash();
 }
-

lib/dpkg/test/t-command.c

@@ -161,4 +161,3 @@ test(void)
 	test_command_add_args();
 	test_command_exec();
 }
-

lib/dpkg/test/t-macros.c

@@ -37,4 +37,3 @@ test(void)
 	test_pass(max(0, 10) == 10);
 	test_pass(max(-10, 0) == 0);
 }
-

lib/dpkg/test/t-path.c

@@ -165,4 +165,3 @@ test(void)
 	test_path_temp();
 	test_path_quote();
 }
-

lib/dpkg/test/t-pkg-list.c

@@ -87,4 +87,3 @@ test(void)
 	test_pkg_list_new();
 	test_pkg_list_prepend();
 }
-

lib/dpkg/test/t-pkg-queue.c

@@ -115,4 +115,3 @@ test(void)
 	test_pkg_queue_init();
 	test_pkg_queue_push_pop();
 }
-

lib/dpkg/test/t-pkginfo.c

@@ -49,4 +49,3 @@ test(void)
 
 	/* FIXME: Complete. */
 }
-

lib/dpkg/test/t-string.c

@@ -111,4 +111,3 @@ test(void)
 	test_str_escape_fmt();
 	test_str_strip_quotes();
 }
-

lib/dpkg/test/t-test.c

@@ -44,4 +44,3 @@ test(void)
 	test_mem("ababcd", ==, "ababff", 4);
 	test_mem("ababcd", !=, "ababff", 6);
 }
-

lib/dpkg/test/t-varbuf.c

@@ -283,4 +283,3 @@ test(void)
 
 	/* FIXME: Complete. */
 }
-

lib/dpkg/test/t-version.c

@@ -152,4 +152,3 @@ test(void)
 	test_version_compare();
 	test_version_parse();
 }
-

lib/dpkg/trigdeferred.l

@@ -237,4 +237,3 @@ trigdef_process_done(void)
 	/* Unlock. */
 	pop_cleanup(ehflag_normaltidy);
 }
-

lib/dpkg/triglib.c

@@ -857,6 +857,7 @@ th_simple_nn_find(const char *name, bool nonew)
 	for (search = trigger_files; search; search = search->next)
 		if (!strcmp(search->name, name))
 			return search;
+
 	/* Not found. */
 	if (nonew)
 		return NULL;

lib/dpkg/utils.c

@@ -76,4 +76,3 @@ fgets_must(char *buf, size_t bufsz, FILE *f, const char *fn)
 
 	return l;
 }
-