projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
types.db: Reintroduced the "spam_check" type.
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
5c3db5d
..
82b4aaa
100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-70,12
+70,12
@@
char *sstrdup (const char *s)
if((r = strdup (s)) == NULL)
{
if((r = strdup (s)) == NULL)
{
-
DEBUG
("Not enough memory.");
- exit(3);
+
ERROR
("Not enough memory.");
+ exit
(3);
}
return (r);
}
return (r);
-}
+}
/* char *sstrdup */
/* Even though Posix requires "strerror_r" to return an "int",
* some systems (e.g. the GNU libc) return a "char *" _and_
/* Even though Posix requires "strerror_r" to return an "int",
* some systems (e.g. the GNU libc) return a "char *" _and_
@@
-131,12
+131,12
@@
void *smalloc (size_t size)
if ((r = malloc (size)) == NULL)
{
if ((r = malloc (size)) == NULL)
{
-
DEBUG
("Not enough memory.");
- exit(3);
+
ERROR
("Not enough memory.");
+ exit
(3);
}
}
- return
r
;
-}
+ return
(r)
;
+}
/* void *smalloc */
#if 0
void sfree (void **ptr)
#if 0
void sfree (void **ptr)
@@
-224,7
+224,7
@@
int strsplit (char *string, char **fields, size_t size)
i = 0;
ptr = string;
saveptr = NULL;
i = 0;
ptr = string;
saveptr = NULL;
- while ((fields[i] = strtok_r (ptr, " \t", &saveptr)) != NULL)
+ while ((fields[i] = strtok_r (ptr, " \t
\r\n
", &saveptr)) != NULL)
{
ptr = NULL;
i++;
{
ptr = NULL;
i++;