pyorbit r163 - in trunk: . src

[gjc svn gnome org]

Author: gjc
Date: Sun Feb  1 17:31:00 2009
New Revision: 163
URL: http://svn.gnome.org/viewvc/pyorbit?rev=163&view=rev

Log:
fix warnings

Modified:
   trunk/ChangeLog
   trunk/src/pycorba-exceptions.c
   trunk/src/pycorba-object.c
   trunk/src/pyorbit-servant.c

Modified: trunk/src/pycorba-exceptions.c
==============================================================================
--- trunk/src/pycorba-exceptions.c	(original)
+++ trunk/src/pycorba-exceptions.c	Sun Feb  1 17:31:00 2009
@@ -178,7 +178,7 @@
     Py_DECREF(pytc);
 
     if (tc->sub_parts != len - 1) {
-	PyErr_Format(PyExc_TypeError, "expected %d arguments, got %d",
+	PyErr_Format(PyExc_TypeError, "expected %d arguments, got %li",
 		     tc->sub_parts, len);
 	return NULL;
     }

Modified: trunk/src/pycorba-object.c
==============================================================================
--- trunk/src/pycorba-object.c	(original)
+++ trunk/src/pycorba-object.c	Sun Feb  1 17:31:00 2009
@@ -80,11 +80,11 @@
 static long
 pycorba_object_tp_hash(PyCORBA_Object *self)
 {
-    CORBA_unsigned_long ret;
+    long ret;
     CORBA_Environment ev;
 
     CORBA_exception_init(&ev);
-    ret = CORBA_Object_hash(self->objref, G_MAXLONG, &ev);
+    ret = (long) CORBA_Object_hash(self->objref, (CORBA_unsigned_long) G_MAXLONG, &ev);
 
     if (pyorbit_check_ex(&ev))
 	return -1;

Modified: trunk/src/pyorbit-servant.c
==============================================================================
--- trunk/src/pyorbit-servant.c	(original)
+++ trunk/src/pyorbit-servant.c	Sun Feb  1 17:31:00 2009
@@ -258,7 +258,7 @@
 	/* wrap a tuple round the return value ... */
 	ret = Py_BuildValue("(N)", ret);
     } else if (n_rets + (has_ret ? 1 : 0) != PySequence_Length(ret)) {
-	g_warning("%s: return sequence length is wrong (expected %d, got %d)",
+	g_warning("%s: return sequence length is wrong (expected %d, got %li)",
 		  imethod->name, n_rets + (has_ret ? 1 : 0),
 		  PySequence_Length(ret));
 	CORBA_exception_set_system(ev, ex_CORBA_DATA_CONVERSION,