projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #2507 from rpv-tomsk/issue-2506
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
87f26df
..
3d57ca6
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-258,7
+258,7
@@
static void uuidcache_init(void) {
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
- s
s
nprintf(device, sizeof(device), "%s/%s", DEVLABELDIR, ptname);
+ snprintf(device, sizeof(device), "%s/%s", DEVLABELDIR, ptname);
if (!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device), label, uuid);
}
if (!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device), label, uuid);
}
@@
-270,11
+270,11
@@
static void uuidcache_init(void) {
static unsigned char fromhex(char c) {
if (isdigit((int)c)) {
static unsigned char fromhex(char c) {
if (isdigit((int)c)) {
- return
(c - '0')
;
+ return
c - '0'
;
} else if (islower((int)c)) {
} else if (islower((int)c)) {
- return
(c - 'a' + 10)
;
+ return
c - 'a' + 10
;
} else {
} else {
- return
(c - 'A' + 10)
;
+ return
c - 'A' + 10
;
}
}
}
}
@@
-335,7
+335,7
@@
static char *get_device_name(const char *optstr) {
char *rc;
if (optstr == NULL) {
char *rc;
if (optstr == NULL) {
- return
(NULL)
;
+ return
NULL
;
} else if (strncmp(optstr, "UUID=", 5) == 0) {
DEBUG("utils_mount: TODO: check UUID= code!");
rc = get_spec_by_uuid(optstr + 5);
} else if (strncmp(optstr, "UUID=", 5) == 0) {
DEBUG("utils_mount: TODO: check UUID= code!");
rc = get_spec_by_uuid(optstr + 5);
@@
-401,7
+401,7
@@
static cu_mount_t *cu_mount_listmntent(void) {
last->next = NULL;
} /* for(p = mntlist; p; p = p->next) */
last->next = NULL;
} /* for(p = mntlist; p; p = p->next) */
- return
(last)
;
+ return
last
;
} /* cu_mount_t *cu_mount_listmntent(void) */
/* #endif HAVE_LISTMNTENT */
} /* cu_mount_t *cu_mount_listmntent(void) */
/* #endif HAVE_LISTMNTENT */
@@
-435,11
+435,11
@@
static cu_mount_t *cu_mount_getfsstat(void) {
DEBUG("utils_mount: getv?fsstat failed: %s",
sstrerror(errno, errbuf, sizeof(errbuf)));
#endif /* COLLECT_DEBUG */
DEBUG("utils_mount: getv?fsstat failed: %s",
sstrerror(errno, errbuf, sizeof(errbuf)));
#endif /* COLLECT_DEBUG */
- return
(NULL)
;
+ return
NULL
;
}
if ((buf = calloc(bufsize, sizeof(*buf))) == NULL)
}
if ((buf = calloc(bufsize, sizeof(*buf))) == NULL)
- return
(NULL)
;
+ return
NULL
;
/* The bufsize needs to be passed in bytes. Really. This is not in the
* manpage.. -octo */
/* The bufsize needs to be passed in bytes. Really. This is not in the
* manpage.. -octo */
@@
-451,7
+451,7
@@
static cu_mount_t *cu_mount_getfsstat(void) {
sstrerror(errno, errbuf, sizeof(errbuf)));
#endif /* COLLECT_DEBUG */
free(buf);
sstrerror(errno, errbuf, sizeof(errbuf)));
#endif /* COLLECT_DEBUG */
free(buf);
- return
(NULL)
;
+ return
NULL
;
}
for (int i = 0; i < num; i++) {
}
for (int i = 0; i < num; i++) {
@@
-478,7
+478,7
@@
static cu_mount_t *cu_mount_getfsstat(void) {
free(buf);
free(buf);
- return
(first)
;
+ return
first
;
}
/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
}
/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
@@
-498,7
+498,7
@@
static cu_mount_t *cu_mount_gen_getmntent(void) {
char errbuf[1024];
ERROR("fopen (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
char errbuf[1024];
ERROR("fopen (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
- return
(NULL)
;
+ return
NULL
;
}
while (getmntent(fp, &mt) == 0) {
}
while (getmntent(fp, &mt) == 0) {
@@
-525,9
+525,9
@@
static cu_mount_t *cu_mount_gen_getmntent(void) {
fclose(fp);
fclose(fp);
- return
(first)
;
+ return
first
;
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT */
+
/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
@@
-549,7
+549,7
@@
static cu_mount_t *cu_mount_getmntent(void) {
char errbuf[1024];
ERROR("setmntent (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
char errbuf[1024];
ERROR("setmntent (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
- return
(NULL)
;
+ return
NULL
;
}
while (getmntent_r(fp, &me, mntbuf, sizeof(mntbuf))) {
}
while (getmntent_r(fp, &me, mntbuf, sizeof(mntbuf))) {
@@
-580,9
+580,9
@@
static cu_mount_t *cu_mount_getmntent(void) {
endmntent(fp);
endmntent(fp);
- DEBUG("utils_mount: return
(0x%p)
", (void *)first);
+ DEBUG("utils_mount: return
0x%p
", (void *)first);
- return
(first)
;
+ return
first
;
} /* HAVE_GETMNTENT_R */
#elif HAVE_ONE_GETMNTENT
} /* HAVE_GETMNTENT_R */
#elif HAVE_ONE_GETMNTENT
@@
-600,7
+600,7
@@
static cu_mount_t *cu_mount_getmntent(void) {
char errbuf[1024];
ERROR("setmntent (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
char errbuf[1024];
ERROR("setmntent (%s): %s", COLLECTD_MNTTAB,
sstrerror(errno, errbuf, sizeof(errbuf)));
- return
(NULL)
;
+ return
NULL
;
}
while ((me = getmntent(fp)) != NULL) {
}
while ((me = getmntent(fp)) != NULL) {
@@
-631,9
+631,9
@@
static cu_mount_t *cu_mount_getmntent(void) {
endmntent(fp);
endmntent(fp);
- DEBUG("utils_mount: return
(0x%p)
", (void *)first);
+ DEBUG("utils_mount: return
0x%p
", (void *)first);
- return
(first)
;
+ return
first
;
}
#endif /* HAVE_ONE_GETMNTENT */
}
#endif /* HAVE_ONE_GETMNTENT */
@@
-647,7
+647,7
@@
cu_mount_t *cu_mount_getlist(cu_mount_t **list) {
cu_mount_t *last = NULL;
if (list == NULL)
cu_mount_t *last = NULL;
if (list == NULL)
- return
(NULL)
;
+ return
NULL
;
if (*list != NULL) {
first = *list;
if (*list != NULL) {
first = *list;
@@
-681,7
+681,7
@@
cu_mount_t *cu_mount_getlist(cu_mount_t **list) {
while ((last != NULL) && (last->next != NULL))
last = last->next;
while ((last != NULL) && (last->next != NULL))
last = last->next;
- return
(last)
;
+ return
last
;
} /* cu_mount_t *cu_mount_getlist(cu_mount_t **list) */
void cu_mount_freelist(cu_mount_t *list) {
} /* cu_mount_t *cu_mount_getlist(cu_mount_t **list) */
void cu_mount_freelist(cu_mount_t *list) {