daemon: Remove some less useful debugging messages.

Remove some debug messages which were basically left over from when
the code was being developed.

However we leave debug messages where it is printing an external
command that is about to be executed, since those are useful.

diff --git a/daemon/find.c b/daemon/find.c
index 626017d..61d4a5f 100644 (file)
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,9 +100,6 @@ do_find (const char *dir)
   free (cmd);
 
   while ((r = input_to_nul (fp, str, PATH_MAX)) > 0) {
-    if (verbose)
-      printf ("find string: %s\n", str);
-
     len = strlen (str);
     if (len <= sysrootdirlen)
       continue;
@@ -197,9 +194,6 @@ do_find0 (const char *dir)
   reply (NULL, NULL);
 
   while ((r = input_to_nul (fp, str, GUESTFS_MAX_CHUNK_SIZE)) > 0) {
-    if (verbose)
-      printf ("find0 string: %s\n", str);
-
     len = strlen (str);
     if (len <= sysrootdirlen)
       continue;

diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c
index e487c6b..a4737b3 100644 (file)
--- a/daemon/lvm-filter.c
+++ b/daemon/lvm-filter.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,9 +56,6 @@ is_filter_line (const char *line)
 static int
 set_filter (const char *filter)
 {
-  if (verbose)
-    fprintf (stderr, "LVM: setting device filter to %s\n", filter);
-
   FILE *ifp = fopen ("/etc/lvm/lvm.conf", "r");
   if (ifp == NULL) {
     reply_with_perror ("open: /etc/lvm/lvm.conf");
@@ -76,8 +73,6 @@ set_filter (const char *filter)
   while (getline (&line, &len, ifp) != -1) {
     int r;
     if (is_filter_line (line)) {
-      if (verbose)
-        fprintf (stderr, "LVM: replacing config line:\n%s", line);
       r = fprintf (ofp, "    filter = [ %s ]\n", filter);
     } else {
       r = fprintf (ofp, "%s", line);

diff --git a/daemon/parted.c b/daemon/parted.c
index 068384e..b9b138e 100644 (file)
--- a/daemon/parted.c
+++ b/daemon/parted.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -287,9 +287,6 @@ test_parted_m_opt (void)
   if (result >= 0)
     return result;
 
-  if (verbose)
-    fprintf (stderr, "Testing if this parted supports '-m' option.\n");
-
   char *err = NULL;
   int r = commandr (NULL, &err, "parted", "-s", "-m", "/dev/null", NULL);
   if (r == -1) {
@@ -328,9 +325,6 @@ print_partition_table (const char *device, int parted_has_m_opt)
   }
   free (err);
 
-  if (verbose)
-    fprintf (stderr, "parted output:\n%s<END>\n", out);
-
   return out;
 }
 

diff --git a/daemon/proto.c b/daemon/proto.c
index 6b7a187..88e2d28 100644 (file)
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,12 +88,6 @@ main_loop (int _sock)
   sock = _sock;
 
   for (;;) {
-    /* Most common errors are leaked memory and leaked file descriptors,
-     * so run this between each command:
-     */
-    if (verbose && 0)
-      ignore_value (system ("ls -l /proc/self/fd"));
-
     /* Read the length word. */
     if (xread (sock, lenbuf, 4) == -1)
       exit (EXIT_FAILURE);

diff --git a/daemon/realpath.c b/daemon/realpath.c
index 89f7737..607381b 100644 (file)
--- a/daemon/realpath.c
+++ b/daemon/realpath.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -92,10 +92,6 @@ do_case_sensitive_path (const char *path)
       continue;
     }
 
-    if (verbose)
-      fprintf (stderr, "case_sensitive_path: path = %s, next = %zu, i = %zu\n",
-               path, next, i);
-
     if ((i == 1 && path[0] == '.') ||
         (i == 2 && path[0] == '.' && path[1] == '.')) {
       reply_with_error ("path contained . or .. elements");

diff --git a/daemon/sync.c b/daemon/sync.c
index 8f5a461..a09c8c1 100644 (file)
--- a/daemon/sync.c
+++ b/daemon/sync.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -103,9 +103,6 @@ sync_win32 (void)
     HANDLE drive;
     DWORD drive_type;
 
-    if (verbose)
-      fprintf (stderr, "sync_win32: examining drive %s\n", p);
-
     /* Ignore removable drives. */
     drive_type = GetDriveType (p);
     if (drive_type == DRIVE_FIXED) {
@@ -122,8 +119,6 @@ sync_win32 (void)
                           NULL, OPEN_EXISTING, 0, 0);
       if (drive == INVALID_HANDLE_VALUE)
         return -1;
-      if (verbose)
-        fprintf (stderr, "sync_win32: flushing %s\n", volname);
 
       BOOL r;
       /* This always fails in Wine:

diff --git a/daemon/xattr.c b/daemon/xattr.c
index bbccc5c..2b4882a 100644 (file)
--- a/daemon/xattr.c
+++ b/daemon/xattr.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -405,28 +405,6 @@ do_lxattrlist (const char *path, char *const *names)
     }
   }
 
-  /* If verbose, debug what we're about to send back. */
-  if (verbose) {
-    fprintf (stderr, "lxattrlist: returning: [\n");
-    for (k = 0; k < ret->guestfs_int_xattr_list_len; ++k) {
-      const guestfs_int_xattr *entry = &ret->guestfs_int_xattr_list_val[k];
-      if (STRNEQ (entry[0].attrname, "")) {
-        fprintf (stderr, "ERROR: expecting empty attrname at k = %zu\n", k);
-        break;
-      }
-      fprintf (stderr, "  %zu: special attrval = %s\n",
-               k, entry[0].attrval.attrval_val);
-      for (i = 1; k+i < ret->guestfs_int_xattr_list_len; ++i) {
-        if (STREQ (entry[i].attrname, ""))
-          break;
-        fprintf (stderr, "    name %s, value length %d\n",
-                 entry[i].attrname, entry[i].attrval.attrval_len);
-      }
-      k += i-1;
-    }
-    fprintf (stderr, "]\n");
-  }
-
   return ret;
 
  error: