[Orca-checkins] r440 - in trunk/orca: . packages/rrdtool-1.0.50/perl-piped packages/rrdtool-1.0.50/perl-shared packages/rrdtool-1.0.50/src

[blair at orcaware.com]

Author: blair at orcaware.com
Date: Sun May  1 23:15:40 2005
New Revision: 440

Modified:
   trunk/orca/INSTALL
   trunk/orca/configure.in
   trunk/orca/packages/rrdtool-1.0.50/perl-piped/RRDp.pm
   trunk/orca/packages/rrdtool-1.0.50/perl-shared/RRDs.pm
   trunk/orca/packages/rrdtool-1.0.50/src/rrd_graph.c
Log:
Fix a file descriptor resource leak and two Boolean tests that always
evaluate true in RRDtool's rrd_graph.c.  Bump the exported and used
minor version of RRDtool so that Orca's copy of RRDtool must be used
instead of an official RRDtool release.

* packages/rrdtool-1.0.50/src/rrd_graph.c
  (copyImage):
    Pass the FILE* to fclose() instead of close().
  (graph_paint):
    Change
      if (rrd_test_error)
    to
      if (rrd_test_error())
    because rrdt_test_error is a function and the first statement
    always evaluates true because it returns the address of the
    function.

* packages/rrdtool-1.0.50/perl-piped/RRDp.pm,
* packages/rrdtool-1.0.50/perl-shared/RRDs.pm:
  Increase VERSION from 1.000501 to 1.000502.

* configure.in:
  Bump the required RRDs Perl VERSION number from 1.000501 to
  1.000502.

* INSTALL:
  Bump the required RRDs Perl VERSION number from 1.000501 to
  1.000502.


Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL	(original)
+++ trunk/orca/INSTALL	Sun May  1 23:15:40 2005
@@ -175,7 +175,7 @@
     Devel::DProf            Not required by Orca        19990108
     Digest::MD5             >= 2.33        >= 2.33      2.33
     Math::IntervalSearch    >= 1.05        >= 1.05      1.05
-    RRDs                    >= 1.000501    >= 1.0.50    1.0.50
+    RRDs                    >= 1.000502    >= 1.0.50    1.0.50
     Storable                >= 2.14        >= 2.14      2.14
     Time::HiRes             Not required by Orca        1.66
     version                 >= 0.42        >= 0.42      0.42

Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	Sun May  1 23:15:40 2005
@@ -38,7 +38,7 @@
 MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05
 MATH_INTERVALSEARCH_VER=1.05
 RRDTOOL_DIR=rrdtool-1.0.50
-RRDTOOL_VER=1.000501
+RRDTOOL_VER=1.000502
 STORABLE_DIR=Storable-2.14
 STORABLE_VER=2.14
 TIME_HIRES_DIR=Time-HiRes-1.66

Modified: trunk/orca/packages/rrdtool-1.0.50/perl-piped/RRDp.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.50/perl-piped/RRDp.pm	(original)
+++ trunk/orca/packages/rrdtool-1.0.50/perl-piped/RRDp.pm	Sun May  1 23:15:40 2005
@@ -110,7 +110,7 @@
 sub end ();
 sub read ();
 
-$VERSION = 1.000501 ;
+$VERSION = 1.000502 ;
 
 sub start ($){
   croak "rrdtool is already running"

Modified: trunk/orca/packages/rrdtool-1.0.50/perl-shared/RRDs.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.50/perl-shared/RRDs.pm	(original)
+++ trunk/orca/packages/rrdtool-1.0.50/perl-shared/RRDs.pm	Sun May  1 23:15:40 2005
@@ -7,7 +7,7 @@
 
 require DynaLoader;
 
-$VERSION = 1.000501;
+$VERSION = 1.000502;
 
 bootstrap RRDs $VERSION;
 

Modified: trunk/orca/packages/rrdtool-1.0.50/src/rrd_graph.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.50/src/rrd_graph.c	(original)
+++ trunk/orca/packages/rrdtool-1.0.50/src/rrd_graph.c	Sun May  1 23:15:40 2005
@@ -2460,7 +2460,7 @@
       }
       gdImageDestroy(img); 
      }
-     close(fi); 
+     fclose(fi); 
    } else {
      rrd_set_error("Error Opeing %s: %s",image,  strerror(errno));
    }
@@ -2623,7 +2623,7 @@
 
   if (im->bkg_image){	/* background image added first */
     copyImage(gif,im->bkg_image,1);
-    if (rrd_test_error) return(-1);
+    if (rrd_test_error()) return(-1);
   }
   else
    {
@@ -2770,7 +2770,7 @@
 
   if (im->ovl_image) {	/* overlay image added last */
     copyImage(gif,im->ovl_image,0);
-    if (rrd_test_error) return(-1);
+    if (rrd_test_error()) return(-1);
    }
     if (strcmp(im->graphfile,"-")==0) {
 #ifdef WIN32