Browse Source

Inline werr() into its only current call site

Guillem Jover 15 years ago
parent
commit
26998971c3
4 changed files with 1 additions and 8 deletions
  1. 1 1
      dpkg-deb/build.c
  2. 0 4
      lib/dpkg/ehandle.c
  3. 0 2
      lib/dpkg/ehandle.h
  4. 0 1
      lib/dpkg/libdpkg.Versions

+ 1 - 1
dpkg-deb/build.c

@@ -491,7 +491,7 @@ void do_build(const char *const *argv) {
     sprintf(versionbuf, "%-8s\n%ld\n", OLDARCHIVEVERSION,
             (long)controlstab.st_size);
     if (fd_write(arfd, versionbuf, strlen(versionbuf)) < 0)
-      werr(debar);
+      ohshite(_("error writing `%s'"), debar);
     fd_fd_copy(gzfd, arfd, -1, _("control member"));
   } else {
     const char deb_magic[] = ARCHIVEVERSION "\n";

+ 0 - 4
lib/dpkg/ehandle.c

@@ -401,10 +401,6 @@ warning(const char *fmt, ...)
   va_end(args);
 }
 
-void werr(const char *fn) {
-  ohshite(_("error writing `%s'"),fn);
-}
-
 void
 do_internerr(const char *file, int line, const char *fmt, ...)
 {

+ 0 - 2
lib/dpkg/ehandle.h

@@ -69,8 +69,6 @@ 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 werr(const char *what) DPKG_ATTR_NORET;
-
 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__)

+ 0 - 1
lib/dpkg/libdpkg.Versions

@@ -22,7 +22,6 @@ LIBDPKG_PRIVATE {
 	ohshitv;
 	ohshite;
 	ohshit;
-	werr;			# XXX: remove
 	do_internerr;
 	warning_get_count;
 	warningv;