X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_info.c;h=216096277f750f1a70529a54e764408d2e975ac0;hb=818549a636c390fb4a8390a7e2195a52293cd56b;hp=177f4ca8b618b95ad705304600eb5a42b528bea7;hpb=aa4d951ab71eb7fe57840c3baaddf36809806aef;p=rrdtool.git

diff --git a/src/rrd_info.c b/src/rrd_info.c
index 177f4ca..2160962 100644
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.10  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_info  Get Information about the configuration of an RRD
  *****************************************************************************/
@@ -83,17 +83,18 @@ rrd_info(int argc, char **argv) {
 info_t *
 rrd_info_r(char *filename) {   
     unsigned int i,ii=0;
-    FILE         *in_file;
     rrd_t        rrd;
     info_t       *data,*cd;
     infoval      info;
+    rrd_file_t*  rrd_file;
 	enum cf_en   current_cf;
 	enum dst_en  current_ds;
 
-    if(rrd_open(filename,&in_file,&rrd, RRD_READONLY)==-1){
+    rrd_file = rrd_open(filename,&rrd, RRD_READONLY);
+    if (rrd_file == NULL) {
 	return(NULL);
     }
-    fclose(in_file);
+    close(rrd_file->fd);
 
     info.u_str=filename;
     cd=info_push(NULL,sprintf_alloc("filename"),    RD_I_STR, info);
@@ -117,7 +118,7 @@ rrd_info_r(char *filename) {
     switch (current_ds) {
 	   case DST_CDEF:
 		  {
-		  char *buffer = 0;
+		  char *buffer = NULL;
 		  rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]),
 			 rrd.ds_def, &buffer);
 		  info.u_str = buffer;
@@ -233,6 +234,7 @@ rrd_info_r(char *filename) {
     }
 	}
 	rrd_free(&rrd);
+    rrd_close(rrd_file);
     return(data);
 
 }