[Py-RRDTool-cvs] py-rrdtool/src _rrdtoolmodule.c

[Hye-Shik C. <pe...@us...>]

perky       06/09/13 02:51:53

  Modified:    src      _rrdtoolmodule.c
  Log:
  - Add Mihai Ibanescu's pythonic rrdtool wrapper.
  - Update my email address.
  - Mark this version as 1.0b1.
  - Apply a patch for rrdtool 1.2.
  
  Revision  Changes    Path
  1.15      +26 -15    py-rrdtool/src/_rrdtoolmodule.c
  
  Index: _rrdtoolmodule.c
  ===================================================================
  RCS file: /cvsroot/py-rrdtool/py-rrdtool/src/_rrdtoolmodule.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- _rrdtoolmodule.c	22 Feb 2003 07:41:19 -0000	1.14
  +++ _rrdtoolmodule.c	13 Sep 2006 09:51:53 -0000	1.15
  @@ -3,11 +3,11 @@
    *
    * RRDTool Python binding
    *
  - * Author  : Hye-Shik Chang <pe...@fa...>
  - * Date    : $Date: 2003/02/22 07:41:19 $
  + * Author  : Hye-Shik Chang <pe...@Fr...>
  + * Date    : $Date: 2006/09/13 09:51:53 $
    * Created : 23 May 2002
    *
  - * $Revision: 1.14 $
  + * $Revision: 1.15 $
    *
    *  ==========================================================================
    *  This file is part of py-rrdtool.
  @@ -28,7 +28,7 @@
    *
    */
   
  -static const char *__version__ = "$Revision: 1.14 $";
  +static const char *__version__ = "$Revision: 1.15 $";
   
   #include "Python.h"
   #include "rrd.h"
  @@ -94,7 +94,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           Py_INCREF(Py_None);
           r = Py_None;
       }
  @@ -122,7 +123,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           Py_INCREF(Py_None);
           r = Py_None;
       }
  @@ -154,7 +156,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           /* Return :
             ((start, end, step), (name1, name2, ...), [(data1, data2, ..), ...]) */
           PyObject    *range_tup, *dsnam_tup, *data_list, *t;
  @@ -189,7 +192,8 @@
                   if (isnan(dv)) {
                       PyTuple_SET_ITEM(t, j, Py_None);
                       Py_INCREF(Py_None);
  -                } else {
  +                }
  +                else {
                       PyTuple_SET_ITEM(t, j, PyFloat_FromDouble((double)dv));
                   }
               }
  @@ -233,15 +237,18 @@
       PyObject        *r;
       char           **argv, **calcpr;
       int              argc, xsize, ysize, i;
  +    double           ymin, ymax;
   
       if (create_args("graph", args, &argc, &argv) < 0)
           return NULL;
   
  -    if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize) == -1) {
  +    if (rrd_graph(argc, argv, &calcpr, &xsize, &ysize, NULL,
  +                  &ymin, &ymax) == -1) {
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           r = PyTuple_New(3);
   
           PyTuple_SET_ITEM(r, 0, PyInt_FromLong((long)xsize));
  @@ -260,7 +267,8 @@
                   free(calcpr[i]);
               }
               free(calcpr);
  -        } else {
  +        }
  +        else {
               Py_INCREF(Py_None);
               PyTuple_SET_ITEM(r, 2, Py_None);
           }
  @@ -290,7 +298,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           Py_INCREF(Py_None);
           r = Py_None;
       }
  @@ -316,7 +325,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else
  +    }
  +    else
           r = PyInt_FromLong((long)ts);
   
       destroy_args(&argv);
  @@ -341,7 +351,8 @@
           PyErr_SetString(ErrorObject, rrd_get_error());
           rrd_clear_error();
           r = NULL;
  -    } else {
  +    }
  +    else {
           Py_INCREF(Py_None);
           r = Py_None;
       }
  @@ -499,6 +510,6 @@
   }
   
   /*
  - * $Id: _rrdtoolmodule.c,v 1.14 2003/02/22 07:41:19 perky Exp $
  + * $Id: _rrdtoolmodule.c,v 1.15 2006/09/13 09:51:53 perky Exp $
    * ex: ts=8 sts=4 et
    */