X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=91545ca2f2e518bfd5f98301239f23221cdf56cf;hb=d92fa11949eb31c2ac038286fde8fab63bffd9c0;hp=d75247dc9e299943ad44bbfa05841ff62105abbe;hpb=4dca5ee2d9ec2f43fec94911b5c4c00930051229;p=rrdtool.git diff --git a/src/rrd_restore.c b/src/rrd_restore.c index d75247d..91545ca 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009 ***************************************************************************** * rrd_restore.c Contains logic to parse XML input and create an RRD file * This file: @@ -9,6 +9,9 @@ * $Id$ *************************************************************************** */ +#include "rrd_tool.h" +#include "rrd_rpncalc.h" + #include #include #include @@ -30,8 +33,6 @@ # define close _close #endif -#include "rrd_tool.h" -#include "rrd_rpncalc.h" #define ARRAY_LENGTH(a) (sizeof (a) / sizeof ((a)[0])) @@ -275,21 +276,21 @@ static int get_xml_double( double *value) { - char *text; + xmlChar *text; double temp; - if ((text = (char *)get_xml_text(reader))!= NULL){ - if (strcasestr(text,"nan")){ + if ((text = get_xml_text(reader))!= NULL){ + if (xmlStrcasestr(text,(xmlChar *)"nan")){ *value = DNAN; xmlFree(text); return 0; } - else if (strcasestr(text,"-inf")){ + else if (xmlStrcasestr(text,(xmlChar *)"-inf")){ *value = -DINF; xmlFree(text); return 0; } - else if (strcasestr(text,"+inf") - || strcasestr(text,"inf")){ + else if (xmlStrcasestr(text,(xmlChar *)"+inf") + || xmlStrcasestr(text,(xmlChar *)"inf")){ *value = DINF; xmlFree(text); return 0;