X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdf.c;h=14954d2acac12600dc2ee9c1efada783597890f3;hp=73604b4ab63ca60fac649bdb51b6a8502313a4fd;hb=04ea1375c55aa67df4e7fc61dbb534111767f3b6;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/df.c b/daemon/df.c
index 73604b4..14954d2 100644
--- a/daemon/df.c
+++ b/daemon/df.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -23,21 +23,21 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
 char *
-do_df ()
+do_df (void)
 {
   int r;
   char *out, *err;
 
-  NEED_ROOT (NULL);
+  NEED_ROOT (, return NULL);
 
   r = command (&out, &err, "df", NULL);
   if (r == -1) {
-    reply_with_error ("df: %s", err);
+    reply_with_error ("%s", err);
     free (out);
     free (err);
     return NULL;
@@ -49,16 +49,16 @@ do_df ()
 }
 
 char *
-do_df_h ()
+do_df_h (void)
 {
   int r;
   char *out, *err;
 
-  NEED_ROOT (NULL);
+  NEED_ROOT (, return NULL);
 
   r = command (&out, &err, "df", "-h", NULL);
   if (r == -1) {
-    reply_with_error ("df -h: %s", err);
+    reply_with_error ("%s", err);
     free (out);
     free (err);
     return NULL;