Use implicit __func__ in internerr() instead of explicit literal strings

dselect/pkgcmds.cc

@@ -44,7 +44,7 @@ packagelist::affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith) {
   case sso_unsorted:
     break;
   default:
-    internerr("unknown statsortorder %d in affectedmatches", statsortorder);
+    internerr("unknown statsortorder %d", statsortorder);
   }
   if (comparewith->priority != pkginfo::pri_unset &&
       (comparewith->priority != pkg->priority ||
@@ -169,7 +169,7 @@ void packagelist::kd_swapstatorder() {
   case sso_state:     statsortorder= sso_unsorted;  break;
   case sso_unsorted:  statsortorder= sso_avail;     break;
   default:
-    internerr("unknown statsort %d in kd_swapstatorder", statsortorder);
+    internerr("unknown statsort %d", statsortorder);
   }
   resortredisplay();
 }
@@ -181,7 +181,7 @@ void packagelist::kd_swaporder() {
   case so_alpha:     sortorder= so_priority;  break;
   case so_unsorted:                           return;
   default:
-    internerr("unknown sort %d in kd_swaporder", sortorder);
+    internerr("unknown sort %d", sortorder);
   }
   resortredisplay();
 }
@@ -219,8 +219,7 @@ void packagelist::kd_versiondisplay() {
   case vdo_none:       versiondisplayopt= vdo_available;  break;
   case vdo_available:  versiondisplayopt= vdo_both;       break;
   default:
-    internerr("unknown versiondisplayopt %d in kd_versiondisplay",
-              versiondisplayopt);
+    internerr("unknown versiondisplayopt %d", versiondisplayopt);
   }
   setwidths();
   leftofscreen= 0;

dselect/pkgdisplay.cc

@@ -178,7 +178,7 @@ void packagelist::setwidths() {
     description_column= versionavailable_column + versionavailable_width + gap_width;
     break;
   default:
-    internerr("unknown versiondisplayopt %d in setwidths", versiondisplayopt);
+    internerr("unknown versiondisplayopt %d", versiondisplayopt);
   }
 
   description_width= total_width - description_column;
@@ -210,8 +210,7 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (status, section)"), xmax-x);
           break;
         default:
-          internerr("bad statsort %d in redrawtitle/so_section",
-                    statsortorder);
+          internerr("bad statsort %d on so_section", statsortorder);
         }
         break;
       case so_priority:
@@ -226,8 +225,7 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (status, priority)"), xmax-x);
           break;
         default:
-          internerr("bad statsort %d in redrawtitle/so_priority",
-                    statsortorder);
+          internerr("bad statsort %d on so_priority", statsortorder);
         }
         break;
       case so_alpha:
@@ -242,14 +240,13 @@ void packagelist::redrawtitle() {
           waddnstr(titlewin, _(" (by status)"), xmax-x);
           break;
         default:
-          internerr("bad statsort %d in redrawtitle/so_priority",
-                    statsortorder);
+          internerr("bad statsort %d on so_priority", statsortorder);
         }
         break;
       case so_unsorted:
         break;
       default:
-        internerr("bad sort %d in redrawtitle", sortorder);
+        internerr("bad sort %d", sortorder);
       }
     }
     const char *helpstring;

dselect/pkglist.cc

@@ -47,7 +47,7 @@ int packagelist::compareentries(const struct perpackagestate *a,
   case sso_unsorted:
     break;
   default:
-    internerr("unknown statsortorder %d in compareentries", statsortorder);
+    internerr("unknown statsortorder %d", statsortorder);
   }
 
   const char *asection= a->pkg->section;
@@ -80,7 +80,7 @@ int packagelist::compareentries(const struct perpackagestate *a,
     return c_name;
   case so_unsorted:
   default:
-    internerr("unsorted or unknown sort %d in compareentries", sortorder);
+    internerr("unsorted or unknown sort %d", sortorder);
   }
   /* never reached, make gcc happy */
   return 1;
@@ -214,8 +214,7 @@ void packagelist::ensurestatsortinfo() {
         }
         break;
       default:
-        internerr("unknown status %d in ensurestatsortinfo sso_avail",
-                  pkg->status);
+        internerr("unknown status %d on sso_avail", pkg->status);
       }
       debug(dbg_general,
             "packagelist[%p]::ensurestatsortinfos() i=%d ssavail=%d",
@@ -248,8 +247,7 @@ void packagelist::ensurestatsortinfo() {
         table[index]->ssstate= sss_installed;
         break;
       default:
-        internerr("unknown status %d in ensurestatsortinfo sso_state",
-                  table[index]->pkg->status);
+        internerr("unknown status %d on sso_state", table[index]->pkg->status);
       }
       debug(dbg_general,
             "packagelist[%p]::ensurestatsortinfos() i=%d ssstate=%d",
@@ -258,7 +256,7 @@ void packagelist::ensurestatsortinfo() {
     calcsssdone= 1;
     break;
   default:
-    internerr("unknown statsortorder %d in ensurestatsortinfo", statsortorder);
+    internerr("unknown statsortorder %d", statsortorder);
   }
 }
 
@@ -303,7 +301,7 @@ void packagelist::sortmakeheads() {
     case sso_unsorted:
       break;
     default:
-      internerr("unknown statsortorder %d in sortmakeheads", statsortorder);
+      internerr("unknown statsortorder %d", statsortorder);
     }
 
     int prioritydiff= (!lastpkg ||

dselect/pkgtop.cc

@@ -71,7 +71,7 @@ int packagelist::describemany(char buf[], const char *prioritystring,
   case sso_unsorted:
     break;
   default:
-    internerr("unknown statsortrder %d in describemany all", statsortorder);
+    internerr("unknown statsortrder %d", statsortorder);
   }
 
   if (!prioritystring) {

lib/dpkg/buffer.c

@@ -79,8 +79,7 @@ buffer_filter_update(struct buffer_data *filter, const void *buf, off_t length)
 		          buf, length);
 		break;
 	default:
-		internerr("unknown data type '%i' in buffer_filter_update",
-		          filter->type);
+		internerr("unknown data type %i", filter->type);
 	}
 
 	return ret;
@@ -133,8 +132,7 @@ buffer_write(struct buffer_data *data, const void *buf, off_t length)
 	case BUFFER_WRITE_NULL:
 		break;
 	default:
-		internerr("unknown data type '%i' in buffer_write",
-		          data->type);
+		internerr("unknown data type %i", data->type);
 	}
 
 	return ret;
@@ -150,8 +148,7 @@ buffer_read(struct buffer_data *data, void *buf, off_t length)
 		ret = fd_read(data->arg.i, buf, length);
 		break;
 	default:
-		internerr("unknown data type '%i' in buffer_read\n",
-		          data->type);
+		internerr("unknown data type %i", data->type);
 	}
 
 	return ret;
@@ -288,8 +285,7 @@ buffer_skip(struct buffer_data *input, off_t limit, const char *desc)
 			ohshite(_("failed to seek %s"), desc);
 		break;
 	default:
-		internerr("unknown data type '%i' in buffer_skip\n",
-		          input->type);
+		internerr("unknown data type %i", input->type);
 	}
 
 	output.type = BUFFER_WRITE_NULL;

lib/dpkg/ehandle.c

@@ -404,7 +404,7 @@ warning(const char *fmt, ...)
 }
 
 void
-do_internerr(const char *file, int line, const char *fmt, ...)
+do_internerr(const char *file, int line, const char *func, const char *fmt, ...)
 {
   va_list args;
   char buf[1024];
@@ -413,8 +413,8 @@ do_internerr(const char *file, int line, const char *fmt, ...)
   vsnprintf(buf, sizeof(buf), fmt, args);
   va_end(args);
 
-  fprintf(stderr, _("%s:%s:%d: internal error: %s\n"),
-          dpkg_get_progname(), file, line, buf);
+  fprintf(stderr, _("%s:%s:%d:%s: internal error: %s\n"),
+          dpkg_get_progname(), file, line, func, buf);
 
   abort();
 }

lib/dpkg/ehandle.h

@@ -72,9 +72,10 @@ void ohshitv(const char *fmt, va_list args)
 void ohshit(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
 void ohshite(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
 
-void do_internerr(const char *file, int line, const char *fmt, ...)
-	DPKG_ATTR_NORET DPKG_ATTR_PRINTF(3);
-#define internerr(...) do_internerr(__FILE__, __LINE__, __VA_ARGS__)
+void do_internerr(const char *file, int line, const char *func,
+                  const char *fmt, ...)
+	DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4);
+#define internerr(...) do_internerr(__FILE__, __LINE__, __func__, __VA_ARGS__)
 
 /** @} */
 

src/depcon.c

@@ -82,8 +82,7 @@ deppossi_pkg_iter_next(struct deppossi_pkg_iterator *iter)
         pkgbin = &pkg_cur->installed;
       break;
     default:
-      internerr("bad value (%d) for wpb in deppossi_pkg_iter_next()",
-                iter->which_pkgbin);
+      internerr("unknown which_pkgbin %d", iter->which_pkgbin);
     }
 
     if (archsatisfied(pkgbin, iter->possi))