Unify usage of FIXME in comments

TODO

@@ -6,6 +6,8 @@ lenny
 
  * Review this file and remove or update the old entries.
 
+ * Look for FIXME and XXX items in the source.
+
  * Triage as much bugs as possible to get the bug count below 300 ;) and
    merge as much patches as possible.
 

dselect/basecmds.cc

@@ -83,7 +83,7 @@ void baselist::kd_redraw() {
 //  RFSH(colheadspad); 
 //  RFSH(thisstatepad); 
 //  RFSH(titlewin); 
-//  RFSH(whatinfowin); /* fixme-ncurses: why does ncurses need this ? */
+//  RFSH(whatinfowin); /* FIXME: why does ncurses need this? */
   clearok(curscr,TRUE);
   redrawall();
   if (debug) fprintf(debug,"baselist[%p]::kd_redraw() done\n",this);
@@ -119,11 +119,11 @@ void baselist::kd_search() {
   strcpy(newsearchstring,searchstring);
   werase(querywin);
   mvwaddstr(querywin,0,0, _("Search for ? "));
-  echo(); /* fixme: ncurses documentation or implementation */
+  echo(); /* FIXME: ncurses documentation or implementation. */
   if (wgetnstr(querywin,newsearchstring,sizeof(newsearchstring)-1) == ERR)
     searchstring[0]= 0;
-  raise(SIGWINCH); /* fixme: ncurses and xterm arrow keys */
-  noecho(); /* fixme: ncurses */
+  raise(SIGWINCH); /* FIXME: ncurses and xterm arrow keys. */
+  noecho(); /* FIXME: ncurses. */
   if (whatinfo_height) { touchwin(whatinfowin); refreshinfo(); }
   else if (info_height) { touchwin(infopad); refreshinfo(); }
   else if (thisstate_height) redrawthisstate();

dselect/main.cc

@@ -438,7 +438,7 @@ urqresult urq_menu(void) {
       dme(cursor,0); cursor+= entries-1; cursor %= entries; dme(cursor,1);
     } else if (c=='\n' || c=='\r' || c==KEY_ENTER) {
       clear(); refresh();
-      switch (menuentries[cursor].fn()) { /* fixme: trap errors in urq_... */
+      switch (menuentries[cursor].fn()) { /* FIXME: trap errors in urq_... */
       case urqr_quitmenu:
         return urqr_quitmenu;
       case urqr_normal:
@@ -475,8 +475,8 @@ urqresult urq_menu(void) {
 }
 
 urqresult urq_quit(void) {
+  /* FIXME: check packages OK. */
   return urqr_quitmenu;
-  /* fixme: check packages OK */
 }
 
 int main(int, const char *const *argv) {

dselect/pkgcmds.cc

@@ -280,7 +280,7 @@ packagelist::kd_revertinstalled()
   redrawthisstate();
 }
 
-/* fixme: configurable purge/deselect */
+/* FIXME: configurable purge/deselect */
 
 void packagelist::kd_toggleinfo() {
   showinfo= (showinfo+2) % 3;

dselect/pkgdepcon.cc

@@ -194,7 +194,7 @@ int packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *display
   if (best->spriority >= sp_deselecting) return 0;
   best->suggested=
     best->pkg->status == pkginfo::stat_notinstalled
-      ? pkginfo::want_purge : pkginfo::want_deinstall; /* fixme: configurable */
+      ? pkginfo::want_purge : pkginfo::want_deinstall; // FIXME: configurable.
   best->selected= best->suggested;
   best->spriority= sp_deselecting;
 
@@ -307,7 +307,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     if (depends->type != dep_recommends) {
       best->selected= best->suggested=
         best->pkg->status == pkginfo::stat_notinstalled
-          ? pkginfo::want_purge : pkginfo::want_deinstall; /* fixme: configurable */
+          ? pkginfo::want_purge : pkginfo::want_deinstall; // FIXME: configurable
       best->spriority= sp_deselecting;
     }
     return r ? 2 : 0;

dselect/pkglist.cc

@@ -398,7 +398,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
     if (readwrite && pkg->want == pkginfo::want_unknown) {
       state->suggested=
         pkg->status == pkginfo::stat_installed ||
-          pkg->priority <= pkginfo::pri_standard /* fixme: configurable */
+          pkg->priority <= pkginfo::pri_standard /* FIXME: configurable */
             ? pkginfo::want_install : pkginfo::want_purge;
       state->spriority= sp_inherit;
     } else {

dselect/pkgtop.cc

@@ -155,7 +155,7 @@ void packagelist::redraw1itemsel(int index, int selected) {
               gettext(statusstrings[pkg->status]));
       wprintw(listpad, "%-*.*s ",
               status_want_width, status_want_width,
-              /* fixme: keep this ? */
+              /* FIXME: keep this? */
               /*table[index]->original == table[index]->selected ? "(same)"
               : */gettext(wantstrings[table[index]->original]));
       wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
@@ -175,7 +175,7 @@ void packagelist::redraw1itemsel(int index, int selected) {
       mvwaddch(listpad, screenline, 0, eflagchars[pkg->eflag]);
       waddch(listpad, statuschars[pkg->status]);
       waddch(listpad,
-             /* fixme: keep this feature? */
+             /* FIXME: keep this feature? */
              /*table[index]->original == table[index]->selected ? ' '
              : */wantchars[table[index]->original]);
     

lib/dump.c

@@ -20,7 +20,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* fixme: don't write uninteresting packages */
+/* FIXME: don't write uninteresting packages */
 #include <config.h>
 
 #include <stdio.h>

lib/parse.c

@@ -290,9 +290,9 @@ int parsedb(const char *filename, enum parsedbflags flags,
                   _("package has status triggers-pending but no triggers "
                     "pending"));
 
-    /* There was a bug that could make a not-installed package have
+    /* FIXME: There was a bug that could make a not-installed package have
      * conffiles, so we check for them here and remove them (rather than
-     * calling it an error, which will do at some point -- fixme).
+     * calling it an error, which will do at some point).
      */
     if (!(flags & pdb_recordavailable) &&
         newpig.status == stat_notinstalled &&

lib/parsehelp.c

@@ -88,13 +88,16 @@ const struct namevalue priorityinfos[]= {  /* Note !  These must be in order ! *
   { "required",                       pri_required,     8 },
   { "important",                      pri_important,    9 },
   { "standard",                       pri_standard,     8 },
-  { "recommended",                    pri_recommended,  11 }, /* fixme: obsolete */
+  /* XXX: obsolete. */
+  { "recommended",                    pri_recommended,  11 },
   { "optional",                       pri_optional,     8 },
   { "extra",                          pri_extra,        5 },
-  { "contrib",                        pri_contrib,      7 }, /* fixme: keep? */
+  /* XXX: keep? */
+  { "contrib",                        pri_contrib,      7 },
   { "this is a bug - please report",  pri_other,        28 },
   { "unknown",                        pri_unknown,      7 },
-  { "base",                           pri_required,     4 }, /* fixme: alias, remove */
+  /* XXX: alias, remove. */
+  { "base",                           pri_required,     4 },
   {  NULL                                                 }
 };
 
@@ -108,8 +111,10 @@ const struct namevalue statusinfos[]= {  /* Note !  These must be in order ! */
   { "triggers-pending", stat_triggerspending, 16 },
   { "installed",       stat_installed,       9 },
   /* These are additional entries for reading only, in any order ... */
-  { "postinst-failed", stat_halfconfigured,  15 }, /* fixme: backwards compat., remove */
-  { "removal-failed",  stat_halfinstalled,   14 }, /* fixme: backwards compat., remove */
+  /* XXX: backwards compat., remove. */
+  { "postinst-failed", stat_halfconfigured,  15 },
+  /* XXX: backwards compat., remove. */
+  { "removal-failed",  stat_halfinstalled,   14 },
   {  NULL                                       }
 };
 

scripts/install-info.pl

@@ -10,8 +10,8 @@ use Dpkg::Gettext;
 
 textdomain("dpkg");
 
-# fixme: sort entries
-# fixme: send to FSF ?
+# FIXME: sort entries
+# FIXME: send to FSF ?
 
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;

src/configure.c

@@ -646,7 +646,7 @@ static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
 			else if (what & cfof_install) { cc= 'y'; break; }
 		}
 
-		/* fixme: say something if silently not install */
+		/* FIXME: say something if silently not install */
 		if (cc == 'd')
 			showdiff(realold, realnew);
 

src/enquiry.c

@@ -19,7 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* fixme: per-package audit */
+/* FIXME: per-package audit */
 #include <config.h>
 
 #include <stdio.h>

src/help.c

@@ -144,8 +144,8 @@ int force_conflicts(struct deppossi *possi) {
 
 static const char* preexecscript(const char *path, char *const *argv) {
   /* returns the path to the script inside the chroot
-   * none of the stuff here will work if admindir isn't inside instdir
-   * as expected. - fixme
+   * FIXME: none of the stuff here will work if admindir isn't inside
+   * instdir as expected.
    */
   size_t instdirl;