Improve internerr output messages and print the invalid value

15 files changed, 53 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 874b56e26..4c51298a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2008-12-08  Guillem Jover  <guillem@debian.org>
 
+	* dpkg-deb/extract.c (extracthalf): Improve internerr strings, and add
+	the invalid value provoking the call.
+	* dpkg-split/queue.c (discardsome): Likewise.
+	* lib/dbmodify.c (modstatdb_init): Likewise.
+	* lib/dump.c (varbufdependency): Likewise.
+	* lib/parsehelp.c (varbufversion): Likewise.
+	* lib/vercmp.c (versionsatisfied3): Likewise.
+	* scripts/Dpkg/Source/Archive.pm (_add_entry): Likewise.
+	* src/archives.c (tarobject, archivefiles): Likewise.
+	* src/configure.c (deferred_configure, promptconfaction): Likewise.
+	* src/depcon.c (describedepcon, depisok): Likewise.
+	* src/enquiry.c (yettobeunpacked): Likewise.
+	* src/packages.c (packages, process_queue, dependencies_ok): Likewise.
+	* src/query.c (enqperpackage): Likewise.
+	* src/update.c (updateavailable): Likewise.
+
+2008-12-08  Guillem Jover  <guillem@debian.org>
+
 	* scripts/Dpkg/Deps.pm (implies): Do not mark internerr strings for
 	translation.
 	* scripts/Dpkg/Fields.pm (output): Likewise.
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 1d13c66a1..96fce6572 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -306,7 +306,8 @@ void extracthalf(const char *debar, const char *directory,
   if (taroption) {
     if (!(c3= m_fork())) {
       char buffer[30+2];
-      if(strlen(taroption) > 30) internerr(taroption);
+      if (strlen(taroption) > 30)
+        internerr("taroption is too long '%s'", taroption);
       strcpy(buffer, taroption);
       strcat(buffer, "f");
       m_dup2(p2[0],0);
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index b65713313..85136ac00 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -256,7 +256,8 @@ static void discardsome(enum discardwhich which, const char *package) {
       break;
     case ds_all:
       break;
-    default: internerr("bad discardsome which");
+    default:
+      internerr("unknown discardwhich '%d'", which);
     }
     if (unlink(pq->info.filename))
       ohshite(_("unable to discard `%.250s'"),pq->info.filename);
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index e7f62d8cb..7ff6990eb 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -176,7 +176,7 @@ enum modstatdb_rw modstatdb_init(const char *adir, enum modstatdb_rw readwritere
   case msdbrw_readonly:
     cstatus= msdbrw_readonly; break;
   default:
-    internerr("unknown readwritereq");
+    internerr("unknown modstatdb_rw '%d'", readwritereq);
   }
 
   updatefnbuf= m_malloc(strlen(adir)+sizeof(UPDATESDIR)+IMPORTANTMAXLEN+5);
diff --git a/lib/dump.c b/lib/dump.c
index 1c77ea521..0d4bb4416 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -226,7 +226,8 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep) {
       case dvr_earlierequal: varbufaddstr(vb,"<="); break;
       case dvr_laterstrict: varbufaddstr(vb,">>"); break;
       case dvr_earlierstrict: varbufaddstr(vb,"<<"); break;
-      default: internerr("unknown verrel");
+      default:
+        internerr("unknown verrel '%d'", dop->verrel);
       }
       varbufaddc(vb,' ');
       varbufversion(vb,&dop->version,vdew_nonambig);
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 02e90a11c..55c7ab63c 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -191,7 +191,7 @@ void varbufversion
     varbufprintf(vb,"%lu:",version->epoch);
     break;
   default:
-    internerr("bad versiondisplayepochwhen in varbufversion");
+    internerr("unknown versiondisplayepochwhen '%d'", vdew);
   }
   if (version->version) varbufaddstr(vb,version->version);
   if (version->revision && *version->revision) {
diff --git a/lib/vercmp.c b/lib/vercmp.c
index dd6503106..3e02adebe 100644
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -88,7 +88,8 @@ int versionsatisfied3(const struct versionrevision *it,
   case dvr_earlierstrict:  return r < 0;
   case dvr_laterstrict:    return r > 0;
   case dvr_exact:          return r == 0;
-  default:                 internerr("unknown verrel");
+  default:
+    internerr("unknown depverrel '%d'", verrel);
   }
   return 0;
 }
diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm
index 5d1ae4eec..ed0c19aa8 100644
--- a/scripts/Dpkg/Source/Archive.pm
+++ b/scripts/Dpkg/Source/Archive.pm
@@ -52,7 +52,7 @@ sub create {
 
 sub _add_entry {
     my ($self, $file) = @_;
-    internerr("call create first") unless $self->{"tar_input"};
+    internerr("call create() first") unless $self->{"tar_input"};
     $file = $2 if ($file =~ /^\Q$self->{'cwd'}\E\/(.+)$/); # Relative names
     print({ $self->{'tar_input'} } "$file\0") ||
 	    syserr(_g("write on tar input"));
diff --git a/src/archives.c b/src/archives.c
index 80f2d8032..d2881c55c 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -750,7 +750,7 @@ int tarobject(struct TarInfo *ti) {
     newtarobject_allmodes(fnamenewvb.buf,ti,nifd->namenode->statoverride);
     break;
   default:
-    internerr("bad tar type, but already checked");
+    internerr("unknown tar type '%d', but already checked", ti->Type);
   }
   /* CLEANUP: Now we have extracted the new object in .dpkg-new (or,
    * if the file already exists as a directory and we were trying to extract
@@ -1227,7 +1227,7 @@ void archivefiles(const char *const *argv) {
   case act_avail:
     break;
   default:
-    internerr("unknown action");
+    internerr("unknown action '%d'", cipaction->arg);
   }
 
   trigproc_run_deferred();
diff --git a/src/configure.c b/src/configure.c
index 65744ba0e..de59a34bc 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -295,7 +295,7 @@ void deferred_configure(struct pkginfo *pkg) {
 					break;
 
 				default:
-					internerr("unknown what");
+					internerr("unknown conffopt '%d'", what);
 			}
 
 			conff->hash= nfstrsave(newdisthash);
@@ -667,7 +667,7 @@ static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
 			break;
 
 		default:
-			internerr("unknown response");
+			internerr("unknown response '%d'", cc);
 	}
 
 	return what;
diff --git a/src/depcon.c b/src/depcon.c
index 34d428d4a..7c6f33863 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -184,7 +184,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
     fmt = _("%s enhances %s");
     break;
   default:
-    internerr("unknown deptype");
+    internerr("unknown deptype '%d'", dep->type);
   }
 
   varbufdependency(&depstr, dep);
@@ -246,13 +246,13 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
     case stat_halfconfigured: case stat_unpacked:
       return 1;
     default:
-      internerr("unknown status depending");
+      internerr("unknown status depending '%d'", dep->up->status);
     }
     break;
   case itb_installnew: case itb_preinstall:
     break;
   default:
-    internerr("unknown istobe depending");
+    internerr("unknown istobe depending '%d'", dep->up->clientdata->istobe);
   }
 
   /* Describe the dependency, in case we have to moan about it. */
@@ -332,7 +332,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
         }
         break;
       default:
-        internerr("unknown istobe depended");
+        internerr("unknown istobe depended '%d'", possi->ed->clientdata->istobe);
       }
       varbufaddstr(whynot, linebuf);
 
@@ -376,7 +376,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
                     gettext(statusstrings[provider->up->up->status]));
             break;
           default:
-            internerr("unknown istobe provider");
+            internerr("unknown istobe provider '%d'",
+                      provider->up->up->clientdata->istobe);
           }
           varbufaddstr(whynot, linebuf);
         }
@@ -449,7 +450,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
         }
         break;
       default:
-        internerr("unknown istobe conflict");
+        internerr("unknown istobe conflict '%d'",
+                  possi->ed->clientdata->istobe);
       }
     }
 
@@ -514,7 +516,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
           }
           break;
         default:
-          internerr("unknown istobe conflict provider");
+          internerr("unknown istobe conflict provider '%d'",
+                    provider->up->up->clientdata->istobe);
         }
       }
     }
diff --git a/src/enquiry.c b/src/enquiry.c
index c708efaa4..68e4acb30 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -154,7 +154,7 @@ static int yettobeunpacked(struct pkginfo *pkg, const char **thissect) {
       *thissect= pkg->section && *pkg->section ? pkg->section : _("<unknown>");
     return 1;
   default:
-    internerr("unknown status checking for unpackedness");
+    internerr("unknown package status '%d'", pkg->status);
   }
   return 0;
 }
diff --git a/src/packages.c b/src/packages.c
index 11acc4e4f..1bcdfdb06 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -134,7 +134,7 @@ void packages(const char *const *argv) {
           continue;
         break;
       default:
-        internerr("unknown action for pending");
+        internerr("unknown action '%d'", cipaction->arg);
       }
       add_to_queue(pkg);
     }
@@ -182,7 +182,8 @@ void process_queue(void) {
   case act_triggers:
   case act_configure: case act_install:  istobe= itb_installnew;  break;
   case act_remove: case act_purge:       istobe= itb_remove;      break;
-  default: internerr("unknown action for queue start");
+  default:
+    internerr("unknown action '%d'", cipaction->arg);
   }
   for (rundown = queue.head; rundown; rundown = rundown->next) {
     ensure_package_clientdata(rundown->pkg);
@@ -200,7 +201,7 @@ void process_queue(void) {
                rundown->pkg->name);
         break;
       default:
-        internerr("unknown action in duplicate");
+        internerr("unknown action '%d'", cipaction->arg);
       }
       rundown->pkg = NULL;
    } else {
@@ -262,7 +263,7 @@ void process_queue(void) {
       deferred_remove(pkg);
       break;
     default:
-      internerr("unknown action in queue");
+      internerr("unknown action '%d'", cipaction->arg);
     }
     if (ferror(stdout)) werr("stdout");
     if (ferror(stderr)) werr("stderr");
@@ -609,7 +610,7 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
     case 3:
       break;
     default:
-      internerr("unknown value for found");
+      internerr("unknown value for found '%d'", found);
     }
   }
   if (ok == 0 && (pkg->clientdata && pkg->clientdata->istobe == itb_remove))
diff --git a/src/query.c b/src/query.c
index 9f4bf81d8..b7ba2f60a 100644
--- a/src/query.c
+++ b/src/query.c
@@ -366,7 +366,7 @@ void enqperpackage(const char *const *argv) {
       break;
 
     default:
-      internerr("unknown action");
+      internerr("unknown action '%d'", cipaction->arg);
     }
 
     if (*(argv + 1) == NULL)
diff --git a/src/update.c b/src/update.c
index cba775b7e..48eeebc6d 100644
--- a/src/update.c
+++ b/src/update.c
@@ -51,7 +51,7 @@ void updateavailable(const char *const *argv) {
       badusage(_("--%s needs exactly one Packages file argument"),cipaction->olong);
     break;
   default:
-    internerr("bad cipaction->arg in updateavailable");
+    internerr("unknown action '%d'", cipaction->arg);
   }
   
   if (!f_noact) {
@@ -74,7 +74,7 @@ void updateavailable(const char *const *argv) {
   case act_avclear:
     break;
   default:
-    internerr("bad cipaction->arg in update available");
+    internerr("unknown action '%d'", cipaction->arg);
   }
 
   varbufaddstr(&vb,admindir);