dpkg: Use the debug function instead of reimplementing its logic

diff --git a/ChangeLog b/ChangeLog
index 99f2f21767248b422115cf69918d50378b0355d9..1098a094dff929fd49690abf8bc74e3cb265f3f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-01  Guillem Jover  <guillem@debian.org>
+
+       * src/depcon.c (findbreakcyclerecursive): Use the debug function
+       instead of reimplementing its logic.
+       * src/help.c (preexecscript): Likewise.
+
 2008-07-01  Egmont Koblinger  <egmont@uhulinux.hu>
 
        * src/processarc.c (process_archive): Properly lstat the correct

diff --git a/src/depcon.c b/src/depcon.c
index 2930c5c64455096b29671d3ce11f9d3849659a56..c145501a850fa3af502812f8c0d95c9a993cd23c 100644 (file)
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -102,9 +102,16 @@ static int findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *s
   pkg->color = gray;
   
   if (f_debug & dbg_depcondetail) {
-    fprintf(stderr,"D0%05o: findbreakcyclerecursive %s ",dbg_depcondetail,pkg->name);
-    for (sol=sofar; sol; sol=sol->back) fprintf(stderr," <- %s",sol->pkg->name);
-    fprintf(stderr,"\n");
+    struct varbuf str_pkgs = VARBUF_INIT;
+
+    for (sol = sofar; sol; sol = sol->back) {
+      varbufaddstr(&str_pkgs, " <- ");
+      varbufaddstr(&str_pkgs, sol->pkg->name);
+    }
+    varbufaddc(&str_pkgs, '\0');
+    debug(dbg_depcondetail, "findbreakcyclerecursive %s %s", pkg->name,
+          str_pkgs.buf);
+    varbuffree(&str_pkgs);
   }
   thislink.pkg= pkg;
   thislink.back= sofar;

diff --git a/src/help.c b/src/help.c
index 0e6f2292c7a7a8cfd038626b5b330e542d412f6a..26385cb5b94597c6bcbdce4eaa7105863427930e 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -155,9 +155,15 @@ static const char* preexecscript(const char *path, char *const *argv) {
     if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
   }
   if (f_debug & dbg_scripts) {
-    fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
-    while (*++argv) fprintf(stderr," %s",*argv);
-    fputs(" )\n",stderr);
+    struct varbuf args = VARBUF_INIT;
+
+    while (*++argv) {
+      varbufaddc(&args, ' ');
+      varbufaddstr(&args, *argv);
+    }
+    varbufaddc(&args, '\0');
+    debug(dbg_scripts, "fork/exec %s (%s )", path, args.buf);
+    varbuffree(&args);
   }
   instdirl= strlen(instdir);
   if (!instdirl) return path;