projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable pango markup by default. added --pango-markup option for explicit enablement.
[rrdtool.git]
/
src
/
rrd_thread_safe.c
diff --git
a/src/rrd_thread_safe.c
b/src/rrd_thread_safe.c
index
112d82c
..
3138cc8
100644
(file)
--- a/
src/rrd_thread_safe.c
+++ b/
src/rrd_thread_safe.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3rc
3
Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3rc
7
Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
@@
-60,7
+60,7
@@
const char *rrd_strerror(
{
struct rrd_context *ctx = rrd_get_context();
{
struct rrd_context *ctx = rrd_get_context();
- if (strerror_r(err, ctx->lib_errstr,
ctx->errlen
))
+ if (strerror_r(err, ctx->lib_errstr,
sizeof(ctx->lib_errstr)
))
return "strerror_r failed. sorry!";
else
return ctx->lib_errstr;
return "strerror_r failed. sorry!";
else
return ctx->lib_errstr;
@@
-75,8
+75,8
@@
const char *rrd_strerror(
ctx = rrd_get_context();
pthread_mutex_lock(&mtx);
ctx = rrd_get_context();
pthread_mutex_lock(&mtx);
- strncpy(ctx->lib_errstr, strerror(err),
ctx->errlen
);
- ctx->lib_errstr[
ctx->errlen
] = '\0';
+ strncpy(ctx->lib_errstr, strerror(err),
sizeof(ctx->lib_errstr)
);
+ ctx->lib_errstr[
sizeof(ctx->lib_errstr) - 1
] = '\0';
pthread_mutex_unlock(&mtx);
return ctx->lib_errstr;
}
pthread_mutex_unlock(&mtx);
return ctx->lib_errstr;
}