Fixed up numerous compiler warnings

diff --git a/ChangeLog b/ChangeLog
index 765f31918e63f653cad73010f63fbe8c071af8c3..7a02d58b8a5a31c1a680955ea493ceaba246b9ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Mar 06 16:52:12 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * include/libvirt/libvirt.h.in, python/libvir.c, src/driver.h
+       src/libvirt.c, src/qemu_internal.c, src/test.c, src/virsh.c,
+       src/xend_internal.c, src/xm_intenral.c: Change const char **
+       to char **const to fix compiler warnings
+       * python/Makefile.am: Don't warn about redundant decls
+       * python/libvirt_wrap.h: Ensure PyGILState is always initialized
+       * tests/reconnect.c: Added ATTRIBUTE_UNUSED annotation
+         All patches from Richard Jones
+
 Tue Mar 06 14:21:12 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * src/xend_internal.c, src/xml.c, src/xm_internal.c: Support

diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index ce24f59fc03dad5554eb32f138c508ea43dafe2b..e00b2d6a5a5e258d2b124342da2ba2b7c0dc3d1a 100644 (file)
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -1,4 +1,4 @@
-/*
+/* -*- c -*-
  * libvirt.h:
  * Summary: core interfaces for the libvirt library
  * Description: Provides the interfaces of the libvirt library to handle
@@ -324,7 +324,7 @@ virDomainPtr                virDomainDefineXML      (virConnectPtr conn,
 int                    virDomainUndefine       (virDomainPtr domain);
 int                     virConnectNumOfDefinedDomains  (virConnectPtr conn);
 int                    virConnectListDefinedDomains (virConnectPtr conn,
-                                                const char **names,
+                                                char **const names,
                                                 int maxnames);
 int                    virDomainCreate         (virDomainPtr domain);
 
@@ -472,7 +472,7 @@ typedef virNetwork *virNetworkPtr;
  */
 int                    virConnectNumOfNetworks (virConnectPtr conn);
 int                    virConnectListNetworks  (virConnectPtr conn,
-                                                const char **names,
+                                                char **const names,
                                                 int maxnames);
 
 /*
@@ -480,7 +480,7 @@ int                 virConnectListNetworks  (virConnectPtr conn,
  */
 int                    virConnectNumOfDefinedNetworks  (virConnectPtr conn);
 int                    virConnectListDefinedNetworks   (virConnectPtr conn,
-                                                        const char **names,
+                                                        char **const names,
                                                         int maxnames);
 
 /*

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index c5461f8b23ade2e556c7d16f2b5f773f973397f2..48f815267be878dca9dee9124a49848a88bc851c 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1,4 +1,4 @@
-/*
+/* -*- c -*-
  * libvirt.h:
  * Summary: core interfaces for the libvirt library
  * Description: Provides the interfaces of the libvirt library to handle
@@ -324,7 +324,7 @@ virDomainPtr                virDomainDefineXML      (virConnectPtr conn,
 int                    virDomainUndefine       (virDomainPtr domain);
 int                     virConnectNumOfDefinedDomains  (virConnectPtr conn);
 int                    virConnectListDefinedDomains (virConnectPtr conn,
-                                                const char **names,
+                                                char **const names,
                                                 int maxnames);
 int                    virDomainCreate         (virDomainPtr domain);
 
@@ -472,7 +472,7 @@ typedef virNetwork *virNetworkPtr;
  */
 int                    virConnectNumOfNetworks (virConnectPtr conn);
 int                    virConnectListNetworks  (virConnectPtr conn,
-                                                const char **names,
+                                                char **const names,
                                                 int maxnames);
 
 /*
@@ -480,7 +480,7 @@ int                 virConnectListNetworks  (virConnectPtr conn,
  */
 int                    virConnectNumOfDefinedNetworks  (virConnectPtr conn);
 int                    virConnectListDefinedNetworks   (virConnectPtr conn,
-                                                        const char **names,
+                                                        char **const names,
                                                         int maxnames);
 
 /*

diff --git a/python/.cvsignore b/python/.cvsignore
index 77c04da130ece45c6c12be1577ece8f111efa551..74782756d7ebeb97c28df7ce8a626804a1f964f9 100644 (file)
--- a/python/.cvsignore
+++ b/python/.cvsignore
@@ -4,6 +4,7 @@ Makefile.in
 .libs
 *.lo
 *.la
+*.loT
 libvirt.py
 libvirt-export.c
 libvirtclass.txt

diff --git a/python/Makefile.am b/python/Makefile.am
index d8ffd149ecf7c51a833dff84571f590cfc92f292..dbb471d305d188a4c6a7389bc959798abc04a388 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -33,7 +33,9 @@ all-local: libvirt.py
 python_LTLIBRARIES = libvirtmod.la
 
 libvirtmod_la_SOURCES = libvir.c types.c libvirt-py.c libvirt-py.h
-libvirtmod_la_LIBADD = $(mylibs) 
+libvirtmod_la_LIBADD = $(mylibs)
+# Python header files contain a redundant decl, hence:
+libvirtmod_la_CFLAGS = -Wno-redundant-decls
 
 libvirt.py: $(srcdir)/libvir.py libvirtclass.py
        cat $(srcdir)/libvir.py libvirtclass.py > libvirt.py

diff --git a/python/libvir.c b/python/libvir.c
index 50a44241ef6dc008ec5218989f1919a15adfabf2..d0e6ee72e9ba8b283ca8a3e231363cba3059f201 100644 (file)
--- a/python/libvir.c
+++ b/python/libvir.c
@@ -15,7 +15,7 @@
 #include "libvirt_wrap.h"
 #include "libvirt-py.h"
 
-void initlibvirmod(void);
+extern void initlibvirtmod(void);
 
 PyObject *libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
 PyObject *libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
@@ -266,7 +266,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
             Py_INCREF(Py_None);
             return (Py_None);
         }
-        c_retval = virConnectListDefinedDomains(conn, (const char **)names, c_retval);
+        c_retval = virConnectListDefinedDomains(conn, names, c_retval);
         if (c_retval < 0) {
             free(names);
             Py_INCREF(Py_None);
@@ -375,7 +375,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-PyObject *
+static PyObject *
 libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     virDomainPtr c_retval;

diff --git a/python/libvirt_wrap.h b/python/libvirt_wrap.h
index 8bcfdb3c7f7a998254d08a5e01e13dac80ad0826..547dc6d335248bd5ed409a9b24b5a0c14c2fc24e 100644 (file)
--- a/python/libvirt_wrap.h
+++ b/python/libvirt_wrap.h
@@ -90,7 +90,7 @@ PyObject * libvirt_virDomainPtrWrap(virDomainPtr node);
 
 #define LIBVIRT_ENSURE_THREAD_STATE                    \
   LIBVIRT_STMT_START {                                 \
-  PyGILState_STATE _save;                              \
+    PyGILState_STATE _save = PyGILState_UNLOCKED;      \
     if (PyEval_ThreadsInitialized())                   \
       _save = PyGILState_Ensure();
 

diff --git a/src/driver.h b/src/driver.h
index 082bbf58dbac724182966e4609ede2d757e8bbf5..872524aeeea6538e8946e58c313f14902d455d07 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -104,7 +104,7 @@ typedef char *
                                         int flags);
 typedef int
        (*virDrvListDefinedDomains)     (virConnectPtr conn,
-                                        const char **names,
+                                        char **const names,
                                         int maxnames);
 typedef int
        (*virDrvNumOfDefinedDomains)    (virConnectPtr conn);
@@ -197,13 +197,13 @@ typedef int
        (*virDrvNumOfNetworks)          (virConnectPtr conn);
 typedef int
        (*virDrvListNetworks)           (virConnectPtr conn,
-                                        const char **names,
+                                        char **const names,
                                         int maxnames);
 typedef int
        (*virDrvNumOfDefinedNetworks)   (virConnectPtr conn);
 typedef int
        (*virDrvListDefinedNetworks)    (virConnectPtr conn,
-                                        const char **names,
+                                        char **const names,
                                         int maxnames);
 typedef virNetworkPtr
        (*virDrvNetworkLookupByUUID)    (virConnectPtr conn,

diff --git a/src/libvirt.c b/src/libvirt.c
index 76f9a02e265d91c51d2cab0019746f9929c47443..6f87d49d0a251b387394e0041bfffbc3fced5052 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1795,7 +1795,7 @@ virConnectNumOfDefinedDomains(virConnectPtr conn)
  * Returns the number of names provided in the array or -1 in case of error
  */
 int
-virConnectListDefinedDomains(virConnectPtr conn, const char **names,
+virConnectListDefinedDomains(virConnectPtr conn, char **const names,
                              int maxnames) {
     int ret = -1;
     int i;
@@ -2234,7 +2234,7 @@ virConnectNumOfNetworks(virConnectPtr conn)
  * Returns the number of networks found or -1 in case of error
  */
 int
-virConnectListNetworks(virConnectPtr conn, const char **names, int maxnames)
+virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames)
 {
     int ret = -1;
     int i;
@@ -2305,7 +2305,7 @@ virConnectNumOfDefinedNetworks(virConnectPtr conn)
  * Returns the number of names provided in the array or -1 in case of error
  */
 int
-virConnectListDefinedNetworks(virConnectPtr conn, const char **names,
+virConnectListDefinedNetworks(virConnectPtr conn, char **const names,
                               int maxnames) {
     int ret = -1;
     int i;

diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index bd4b6fbafb388d502fe8127790da8ac193639c35..2349a1b1c8c0079eb305f4c86eee71848b68b264 100644 (file)
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -717,7 +717,7 @@ static int qemuNumOfDefinedDomains(virConnectPtr conn) {
 }
 
 static int qemuListDefinedDomains(virConnectPtr conn,
-                                  const char **names,
+                                  char **const names,
                                   int maxnames){
     struct qemud_packet req, reply;
     int i, nDomains;
@@ -878,7 +878,7 @@ static int qemuNumOfNetworks(virConnectPtr conn) {
 }
 
 static int qemuListNetworks(virConnectPtr conn,
-                            const char **names,
+                            char **const names,
                             int maxnames) {
     struct qemud_packet req, reply;
     int i, nNetworks;
@@ -916,7 +916,7 @@ static int qemuNumOfDefinedNetworks(virConnectPtr conn) {
 }
 
 static int qemuListDefinedNetworks(virConnectPtr conn,
-                                   const char **names,
+                                   char **const names,
                                    int maxnames) {
     struct qemud_packet req, reply;
     int i, nNetworks;

diff --git a/src/test.c b/src/test.c
index c9898cf5e7b1c06f249d975679a13390eeda1dcd..ac096581f447533d1788df8ff9d5184f2c454d2f 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -76,7 +76,7 @@ char * testDomainDumpXML(virDomainPtr domain, int flags);
 
 int testNumOfDefinedDomains(virConnectPtr conn);
 int testListDefinedDomains(virConnectPtr conn,
-                           const char **names,
+                           char **const names,
                            int maxnames);
 
 virDomainPtr testDomainDefineXML(virConnectPtr conn,
@@ -1289,7 +1289,7 @@ int testNumOfDefinedDomains(virConnectPtr conn) {
 }
 
 int testListDefinedDomains(virConnectPtr conn,
-                           const char **names,
+                           char **const names,
                            int maxnames) {
     testCon *con = &node->connections[conn->handle];
     int n = 0, i;

diff --git a/src/virsh.c b/src/virsh.c
index f64dee51fdc4dee64be676b449e4599ffe30e7ff..291d155e201c76780dd2be3bcf6f07f271231be6 100644 (file)
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -471,7 +471,7 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED)
     int all = vshCommandOptBool(cmd, "all");
     int active = !inactive || all ? 1 : 0;
     int *ids = NULL, maxid = 0, i;
-    const char **names = NULL;
+    char **names = NULL;
     int maxname = 0;
     inactive |= all;
 
@@ -1925,7 +1925,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED)
     int all = vshCommandOptBool(cmd, "all");
     int active = !inactive || all ? 1 : 0;
     int maxactive = 0, maxinactive = 0, i;
-    const char **activeNames = NULL, **inactiveNames = NULL;
+    char **activeNames = NULL, **inactiveNames = NULL;
     inactive |= all;
 
     if (!vshConnectionUsability(ctl, ctl->conn, TRUE))

diff --git a/src/xen_internal.c b/src/xen_internal.c
index a53ea89968b4cc7847bd66a7583c55a5022e78c6..54571d93d1aa1ab92f42da3981b0e35e4e03d6cd 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -1127,7 +1127,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt,
  * Initialize the hypervisor layer. Try to detect the kind of interface
  * used i.e. pre or post changeset 10277
  */
-int
+static int
 xenHypervisorInit(void)
 {
     int fd, ret, cmd;

diff --git a/src/xend_internal.c b/src/xend_internal.c
index bc8023d4ef15bfdf10dea1bd1c20e63e2c89c0f9..7341c1ea30c4d8b11c676894288dcef1d48d9e7c 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -41,7 +41,7 @@
 static const char * xenDaemonGetType(virConnectPtr conn);
 static int xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids);
 static int xenDaemonNumOfDomains(virConnectPtr conn);
-static int xenDaemonListDefinedDomains(virConnectPtr conn, const char **names, int maxnames);
+static int xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames);
 static int xenDaemonNumOfDefinedDomains(virConnectPtr conn);
 static virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
 static virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn,
@@ -1038,7 +1038,8 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname,
                      _("domain information incorrect domid not numeric"));
         ret = -1;
     } else if (uuid != NULL) {
-        char **ptr = (char **) &uuid;
+        char *uuid_c = (char *) uuid;
+        char **ptr = &uuid_c;
 
         if (sexpr_uuid(ptr, root, "domain/uuid") == NULL) {
             virXendError(xend, VIR_ERR_INTERNAL_ERROR,
@@ -1108,6 +1109,7 @@ error:
 }
 
 
+#ifndef PROXY
 static int
 xend_detect_config_version(virConnectPtr conn) {
     struct sexpr *root;
@@ -1135,7 +1137,6 @@ xend_detect_config_version(virConnectPtr conn) {
     return conn->xendConfigVersion;
 }
 
-#ifndef PROXY
 /**
  * xend_node_shutdown:
  * @xend: A xend instance
@@ -3087,7 +3088,7 @@ error:
     return(ret);
 }
 
-int xenDaemonListDefinedDomains(virConnectPtr conn, const char **names, int maxnames) {
+int xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) {
     struct sexpr *root = NULL;
     int ret = -1;
     struct sexpr *_for_i, *node;

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 5e76eb0cdee991357cdc346ec283f6e630f62381..40f69874cb614ad325ea4c7685e1b424eb853437 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2196,7 +2196,7 @@ struct xenXMListIteratorContext {
     virConnectPtr conn;
     int max;
     int count;
-    const char **names;
+    char ** names;
 };
 
 static void xenXMListIterator(const void *payload ATTRIBUTE_UNUSED, const char *name, const void *data) {
@@ -2220,7 +2220,7 @@ static void xenXMListIterator(const void *payload ATTRIBUTE_UNUSED, const char *
  * List all defined domains, filtered to remove any which
  * are currently running
  */
-int xenXMListDefinedDomains(virConnectPtr conn, const char **names, int maxnames) {
+int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) {
     struct xenXMListIteratorContext ctx;
 
     if (!VIR_IS_CONNECT(conn)) {

diff --git a/src/xm_internal.h b/src/xm_internal.h
index d86ff290d78f330552de996ee897f47b3d6aa6ea..f28cd66566b6debe27eeee91b49772bce2de3963 100644 (file)
--- a/src/xm_internal.h
+++ b/src/xm_internal.h
@@ -46,7 +46,7 @@ virDomainPtr xenXMDomainLookupByName(virConnectPtr conn, const char *domname);
 virDomainPtr xenXMDomainLookupByUUID(virConnectPtr conn,
                                     const unsigned char *uuid);
 
-int xenXMListDefinedDomains(virConnectPtr conn, const char **names, int maxnames);
+int xenXMListDefinedDomains(virConnectPtr conn, char ** const names, int maxnames);
 int xenXMNumOfDefinedDomains(virConnectPtr conn);
 
 int xenXMDomainCreate(virDomainPtr domain);

diff --git a/tests/reconnect.c b/tests/reconnect.c
index 41466c25c1d256ccea30bfd9bfed96a316db7dd0..6a6a1d22d5b1b21505e3aa4f40318a41ac9aa72f 100644 (file)
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -2,8 +2,10 @@
 #include <stdlib.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
+#include "internal.h"
 
-static void errorHandler(void *userData, virErrorPtr error) {
+static void errorHandler(void *userData ATTRIBUTE_UNUSED,
+                        virErrorPtr error ATTRIBUTE_UNUSED) {
 }
 
 int main(void) {