gimp r25906 - in branches/soc-2008-python: . plug-ins/pygimp

[larsc svn gnome org]

Author: larsc
Date: Mon Jun  9 19:38:24 2008
New Revision: 25906
URL: http://svn.gnome.org/viewvc/gimp?rev=25906&view=rev

Log:
2008-06-09  Lars-Peter Clausen <lars metafoo de>
	Fixed some compiler warnings
	* plug-ins/pygimp/pygimp-colors.c
	* plug-ins/pygimp/pygimp-pdb.c


Modified:
   branches/soc-2008-python/ChangeLog
   branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c
   branches/soc-2008-python/plug-ins/pygimp/pygimp-pdb.c

Modified: branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c	Mon Jun  9 19:38:24 2008
@@ -666,7 +666,7 @@
     PyObject *r_f = NULL, *g_f = NULL, *b_f = NULL, *a_f = NULL;
     PyObject *r = NULL, *g = NULL, *b = NULL, *a = NULL;
     reprfunc repr;
-    char *prefix;
+    const char *prefix;
 
     if (inexact) {
 	repr = PyObject_Str;
@@ -1189,7 +1189,7 @@
     PyObject *h_f = NULL, *s_f = NULL, *v_f = NULL, *a_f = NULL;
     PyObject *h = NULL, *s = NULL, *v = NULL, *a = NULL;
     reprfunc repr;
-    char *prefix;
+    const char *prefix;
 
     if (inexact) {
 	repr = PyObject_Str;
@@ -1702,7 +1702,7 @@
     PyObject *h_f = NULL, *s_f = NULL, *l_f = NULL, *a_f = NULL;
     PyObject *h = NULL, *s = NULL, *l = NULL, *a = NULL;
     reprfunc repr;
-    char *prefix;
+    const char *prefix;
 
     if (inexact) {
 	repr = PyObject_Str;
@@ -2211,7 +2211,7 @@
     PyObject *c_f = NULL, *m_f = NULL, *y_f = NULL, *k_f = NULL, *a_f = NULL;
     PyObject *c = NULL, *m = NULL, *y = NULL, *k = NULL, *a = NULL;
     reprfunc repr;
-    char *prefix;
+    const char *prefix;
 
     if (inexact) {
 	repr = PyObject_Str;

Modified: branches/soc-2008-python/plug-ins/pygimp/pygimp-pdb.c
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/pygimp-pdb.c	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/pygimp-pdb.c	Mon Jun  9 19:38:24 2008
@@ -1049,7 +1049,10 @@
     } else {
         for(i = 0; i < n_params; ++i) {
             if(!(arglist = Py_BuildValue("(i)", params[i].type))) break;
-            if(!(type = PyEval_CallObject(pdb_arg_type, arglist))) break;
+            if(!(type = PyEval_CallObject(pdb_arg_type, arglist))) {
+                Py_DECREF(arglist);
+                break;
+            }
             PyTuple_SetItem(result, i,
                     Py_BuildValue("(Oss)",
                               type,
@@ -1060,7 +1063,6 @@
         }
         
         if(i != n_params) {
-            Py_XDECREF(arglist);
             Py_DECREF(result);
             result = NULL;
         }