projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle cases with two negative numbers
[rrdtool.git]
/
src
/
rrd_restore.c
diff --git
a/src/rrd_restore.c
b/src/rrd_restore.c
index
770e22f
..
a0ef635
100644
(file)
--- a/
src/rrd_restore.c
+++ b/
src/rrd_restore.c
@@
-405,12
+405,11
@@
rrd_write(char *file_name, rrd_t *rrd)
FILE *rrd_file=NULL;
if (strcmp("-",file_name)==0){
FILE *rrd_file=NULL;
if (strcmp("-",file_name)==0){
-
*rrd_file= *
stdout;
+
rrd_file=
stdout;
} else {
} else {
- int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL);
+ int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL
,0666
);
if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
- rrd_set_error("creating '%s': %s",file_name,strerror(errno));
- rrd_free(rrd);
+ rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno));
if (fd != -1)
close(fd);
return(-1);
if (fd != -1)
close(fd);
return(-1);
@@
-513,6
+512,7
@@
rrd_restore(int argc, char **argv)
/* a backwards compatibility routine that will parse the RRA params section
* generated by the aberrant patch to 1.0.28. */
/* a backwards compatibility routine that will parse the RRA params section
* generated by the aberrant patch to 1.0.28. */
+
void
parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index)
{
void
parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index)
{
@@
-557,7
+557,7
@@
parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index)
{
char history[MAX_FAILURES_WINDOW_LEN + 1];
char *violations_array;
{
char history[MAX_FAILURES_WINDOW_LEN + 1];
char *violations_array;
- short i;
+
unsigned
short i;
/* 28 = MAX_FAILURES_WINDOW_LEN */
read_tag(buf, "history", "%28[0-1]", history);
/* 28 = MAX_FAILURES_WINDOW_LEN */
read_tag(buf, "history", "%28[0-1]", history);