X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=2e9b2ae8288dd64f1a75d30b51d83593a8fd4ef8;hb=7e6f12dfba76b295d40e835d310d69d625ede88e;hp=62775fd286df0485c1fd0e23e25142a921e6a4c1;hpb=b958bfe961cf8c6a442d18c714a9d04e947e6b74;p=collectd.git diff --git a/src/df.c b/src/df.c index 62775fd2..2e9b2ae8 100644 --- a/src/df.c +++ b/src/df.c @@ -1,6 +1,6 @@ /** * collectd - src/df.c - * Copyright (C) 2005-2007 Florian octo Forster + * Copyright (C) 2005-2009 Florian octo Forster * Copyright (C) 2009 Paul Sadauskas * * This program is free software; you can redistribute it and/or modify it @@ -33,12 +33,14 @@ # include # endif # define STATANYFS statvfs +# define STATANYFS_STR "statvfs" # define BLOCKSIZE(s) ((s).f_frsize ? (s).f_frsize : (s).f_bsize) #elif HAVE_STATFS # if HAVE_SYS_STATFS_H # include # endif # define STATANYFS statfs +# define STATANYFS_STR "statfs" # define BLOCKSIZE(s) (s).f_bsize #else # error "No applicable input method." @@ -204,7 +206,10 @@ static int df_read (void) mnt_list = NULL; if (cu_mount_getlist (&mnt_list) == NULL) + { + ERROR ("df plugin: cu_mount_getlist failed."); return (-1); + } for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next) { @@ -224,7 +229,8 @@ static int df_read (void) if (STATANYFS (mnt_ptr->dir, &statbuf) < 0) { char errbuf[1024]; - ERROR ("statv?fs failed: %s", + ERROR (STATANYFS_STR"(%s) failed: %s", + mnt_ptr->dir, sstrerror (errno, errbuf, sizeof (errbuf))); continue;