X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_mount.h;h=0a5c980f39be58cd87df3d06667e220677d788af;hb=c53c496b6db4e11fd8aed8df9556dad481220196;hp=822f786e711403a7bbd826e12144201826fe8c4e;hpb=76dc4d3055400e59c453ed1ffbfa70c0a28eae15;p=collectd.git diff --git a/src/utils_mount.h b/src/utils_mount.h index 822f786e..0a5c980f 100644 --- a/src/utils_mount.h +++ b/src/utils_mount.h @@ -1,6 +1,6 @@ /** * collectd - src/utils_mount.h - * Copyright (C) 2005 Niki W. Waibel + * Copyright (C) 2005,2006 Niki W. Waibel * * This program is free software; you can redistribute it and/ * or modify it under the terms of the GNU General Public Li- @@ -12,10 +12,9 @@ * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public Licence for more details. * - * You should have received a copy of the GNU General Public - * Licence along with this program; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, - * USA. + * 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., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Author: * Niki W. Waibel @@ -23,11 +22,10 @@ /* See below for instructions how to use the public functions. */ -#if !COLLECTD_UTILS_MOUNT_H +#ifndef COLLECTD_UTILS_MOUNT_H #define COLLECTD_UTILS_MOUNT_H 1 -#include "common.h" - +#include #if HAVE_FS_INFO_H # include #endif @@ -115,12 +113,12 @@ void cu_mount_freelist(cu_mount_t *list); allocated by *list and *list itself as well. */ -char *cu_mount_checkoption(char *line, char *keyword, int full); +char *cu_mount_checkoption(char *line, const char *keyword, int full); /* DESCRIPTION The cu_mount_checkoption() function is a replacement of char *hasmntopt(const struct mntent *mnt, const char *opt). - In fact hasmntopt() just looks for the first occurence of the + In fact hasmntopt() just looks for the first occurrence of the characters at opt in mnt->mnt_opts. cu_mount_checkoption() checks for the *option* keyword in line, starting at the first character of line or after a ','. @@ -155,7 +153,7 @@ char *cu_mount_checkoption(char *line, char *keyword, int full); maybe you might want to try cu_mount_getoptionvalue()... */ -char *cu_mount_getoptionvalue(char *line, char *keyword); +char *cu_mount_getoptionvalue(char *line, const char *keyword); /* DESCRIPTION The cu_mount_getoptionvalue() function can be used to grab