[libvirt] [libvirt-php 0/3] Eliminated complilation warnings
Hi all: These patch added the -Wall option for compiler, and eliminated all warnings. Lyre (3): Added -Wall option Fixed some compilation warnings Eliminated ununsed variables src/Makefile.am | 4 +- src/libvirt.c | 65 +++++++++--------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-)
* src/Makefile.am: added -Wall option in compling & linking. --- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 059de2c..67a0192 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,8 +14,8 @@ EXTRA_DIST = libvirt.c php_libvirt.h all: build clean-temp build: - $(CC) -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(NAME).o libvirt.c $(XMLCFLAGS) - $(CC) -shared $(LIBS) -rdynamic -o $(NAME).so $(NAME).o -ldl -lvirt $(XMLLIBS) + $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(NAME).o libvirt.c $(XMLCFLAGS) + $(CC) -Wall -shared $(LIBS) -rdynamic -o $(NAME).so $(NAME).o -ldl -lvirt $(XMLLIBS) $(ECHO) "Extension compiled as $(NAME).so" install-exec-local: -- 1.7.1
Eliminated some compliation warings; Fixed "differ in signedness" warnings, It may need to be reviewed. * src/libvirt.c: Added header "standard/info.h"; Added return statement for libvirt_virConnectAuthCallback(); Fixed "differ in signedness" by change or casting those variables to unsigned. --- src/libvirt.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 693443c..524bb6f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5,6 +5,7 @@ #include "php.h" #include "php_ini.h" #include "php_libvirt.h" +#include "standard/info.h" #include <libvirt/libvirt.h> #include <libvirt/virterror.h> @@ -480,6 +481,8 @@ static int libvirt_virConnectAuthCallback(virConnectCredentialPtr cred, unsigne } //printf ("Result: %s (%i)\n",cred[i].result,cred[i].resultlen); } + + return 0; } static int libvirt_virConnectCredType[] = { @@ -512,8 +515,8 @@ PHP_FUNCTION(libvirt_connect) int array_count; char *key; - int key_len; - long index; + unsigned int key_len; + unsigned long index; unsigned long libVer; unsigned long typeVer; @@ -718,7 +721,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid) php_libvirt_connection *conn=NULL; zval *zconn; int uuid_len; - char *uuid=NULL; + unsigned char *uuid=NULL; virDomainPtr domain=NULL; php_libvirt_domain *res_domain; @@ -1145,7 +1148,7 @@ PHP_FUNCTION(libvirt_domain_get_uuid) GET_DOMAIN_FROM_ARGS("r",&zdomain); uuid=emalloc(VIR_UUID_BUFLEN); - retval=virDomainGetUUID(domain->domain,uuid); + retval=virDomainGetUUID(domain->domain, (unsigned char *)uuid); if (retval!=0) RETURN_FALSE; RETURN_STRING(uuid,0); -- 1.7.1
* src/libvirt.c: Eliminated unused variables. --- src/libvirt.c | 54 ++++-------------------------------------------------- 1 files changed, 4 insertions(+), 50 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 524bb6f..54b1342 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -792,11 +792,8 @@ PHP_FUNCTION(libvirt_list_storagepools) { php_libvirt_connection *conn=NULL; zval *zconn; - zval *zdomain; int count=-1; - int maxids=-1; int expectedcount=-1; - int *ids; char **names; int i; @@ -822,7 +819,6 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name) { php_libvirt_connection *conn=NULL; zval *zconn; - zval *zpool; int name_len; char *name=NULL; virStoragePoolPtr pool=NULL; @@ -842,9 +838,7 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name) PHP_FUNCTION(libvirt_storagepool_list_volumes) { - php_libvirt_connection *conn=NULL; php_libvirt_storagepool *pool=NULL; - zval *zconn; zval *zpool; char **names=NULL; int expectedcount=-1; @@ -895,12 +889,9 @@ PHP_FUNCTION(libvirt_storagepool_get_info) PHP_FUNCTION(libvirt_storagevolume_lookup_by_name) { - php_libvirt_connection *conn=NULL; php_libvirt_storagepool *pool=NULL; php_libvirt_volume *res_volume; - zval *zconn; zval *zpool; - zval *zvolume; int name_len; char *name=NULL; virStorageVolPtr volume=NULL; @@ -980,7 +971,6 @@ PHP_FUNCTION(libvirt_list_domains) zval *zconn; zval *zdomain; int count=-1; - int maxids=-1; int expectedcount=-1; int *ids; char **names; @@ -1042,17 +1032,11 @@ PHP_FUNCTION(libvirt_list_active_domains) { php_libvirt_connection *conn=NULL; zval *zconn; - zval *zdomain; int count=-1; - int maxids=-1; int expectedcount=-1; int *ids; - char **names; int i; - virDomainPtr domain=NULL; - php_libvirt_domain *res_domain; - GET_CONNECTION_FROM_ARGS("r",&zconn); expectedcount=virConnectNumOfDomains (conn->conn); @@ -1072,17 +1056,11 @@ PHP_FUNCTION(libvirt_list_defined_domains) { php_libvirt_connection *conn=NULL; zval *zconn; - zval *zdomain; int count=-1; - int maxids=-1; int expectedcount=-1; - int *ids; char **names; int i; - virDomainPtr domain=NULL; - php_libvirt_domain *res_domain; - GET_CONNECTION_FROM_ARGS("r",&zconn); array_init(return_value); @@ -1105,7 +1083,6 @@ PHP_FUNCTION(libvirt_domain_get_name) php_libvirt_domain *domain=NULL; zval *zdomain; const char *name=NULL; - char *name_out; GET_DOMAIN_FROM_ARGS("r",&zdomain); @@ -1123,7 +1100,6 @@ PHP_FUNCTION(libvirt_domain_get_uuid_string) php_libvirt_domain *domain=NULL; zval *zdomain; char *uuid; - char *uuid_out; int retval; GET_DOMAIN_FROM_ARGS("r",&zdomain); @@ -1142,7 +1118,6 @@ PHP_FUNCTION(libvirt_domain_get_uuid) php_libvirt_domain *domain=NULL; zval *zdomain; char *uuid; - char *uuid_out; int retval; GET_DOMAIN_FROM_ARGS("r",&zdomain); @@ -1402,8 +1377,6 @@ PHP_FUNCTION(libvirt_domain_block_stats) php_libvirt_domain *domain=NULL; zval *zdomain; int retval; - long flags=0; - int i; char *path; int path_len; @@ -1519,15 +1492,12 @@ PHP_FUNCTION(libvirt_domain_get_network_info) { php_libvirt_domain *domain=NULL; zval *zdomain; int retval; - int i; char *mac; char *xml; char *tmp = NULL; - int mac_len, isFile; + int mac_len; char fnpath[1024] = { 0 }; - struct _virDomainBlockInfo info; - GET_DOMAIN_FROM_ARGS("rs",&zdomain,&mac,&mac_len); /* Get XML for the domain */ @@ -1567,9 +1537,7 @@ PHP_FUNCTION(libvirt_list_networks) zval *zconn; long flags = VIR_NETWORKS_ACTIVE | VIR_NETWORKS_INACTIVE; int count=-1; - int maxids=-1; int expectedcount=-1; - int *ids; char **names; int i, done = 0; @@ -1617,9 +1585,7 @@ PHP_FUNCTION(libvirt_list_nodedevs) php_libvirt_connection *conn=NULL; zval *zconn; int count=-1; - int maxids=-1; int expectedcount=-1; - int *ids; char *cap = NULL; char **names; int i, cap_len; @@ -1649,8 +1615,6 @@ PHP_FUNCTION(libvirt_nodedev_get) zval *zconn; char *name; int name_len; - char *xml = NULL; - char *xml_out = NULL; GET_CONNECTION_FROM_ARGS("rs",&zconn,&name,&name_len); @@ -1672,9 +1636,8 @@ PHP_FUNCTION(libvirt_nodedev_capabilities) zval *znodedev; int count=-1; int expectedcount=-1; - char *cap = NULL; - char **names, **names2; - int i, ii; + char **names; + int i; GET_NODEDEV_FROM_ARGS("r",&znodedev); @@ -1840,8 +1803,6 @@ PHP_FUNCTION(libvirt_network_get) zval *zconn; char *name; int name_len; - char *xml = NULL; - char *xml_out = NULL; GET_CONNECTION_FROM_ARGS("rs",&zconn,&name,&name_len); @@ -2109,8 +2070,7 @@ PHP_FUNCTION(libvirt_network_get_xml) PHP_FUNCTION(libvirt_domain_get_block_info) { php_libvirt_domain *domain=NULL; zval *zdomain; - int retval, retval2; - int i; + int retval; char *dev; char *xml; char *tmp = NULL; @@ -2190,7 +2150,6 @@ PHP_FUNCTION(libvirt_domain_xml_xpath) { zval *zdomain; zval *zpath; char *xml; - char *xml_out; long path_len=-1, flags = 0; int rc = 0; @@ -2219,8 +2178,6 @@ PHP_FUNCTION(libvirt_domain_interface_stats) php_libvirt_domain *domain=NULL; zval *zdomain; int retval; - long flags=0; - int i; char *path; int path_len; @@ -2288,7 +2245,6 @@ PHP_FUNCTION(libvirt_domain_migrate_to_uri) zval *zdomain; int retval; long flags=0; - int i; char *duri; int duri_len; char *dname; @@ -2316,9 +2272,7 @@ PHP_FUNCTION(libvirt_domain_migrate) virDomainPtr destdomain=NULL; php_libvirt_domain *res_domain; - int retval; long flags=0; - int i; char *dname; int dname_len; long bandwith; -- 1.7.1
On 02/15/2011 10:49 AM, Lyre wrote:
Hi all:
These patch added the -Wall option for compiler, and eliminated all warnings.
Lyre (3): Added -Wall option Fixed some compilation warnings Eliminated ununsed variables
src/Makefile.am | 4 +- src/libvirt.c | 65 +++++++++--------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-)
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Thanks. ACK and pushed! Michal -- Michal Novotny<minovotn@redhat.com>, RHCE Virtualization Team (xen userspace), Red Hat
participants (2)
-
Lyre -
Michal Novotny