master - misc: clean up "char const *" vs "const char *"

Fabio M. Di Nitto fabbione@fedoraproject.org
Wed Jul 30 10:36:00 GMT 2008


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a768396976d39e417a0ce5db8e7bb444b3ef1647
Commit:        a768396976d39e417a0ce5db8e7bb444b3ef1647
Parent:        db0f63e07772a29541918fffedfbbdee794dba5e
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Jul 30 10:32:15 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jul 30 10:32:15 2008 +0200

misc: clean up "char const *" vs "const char *"

this is cosmetic from a C point of view, but the perl xs preprocessor
complains about it.

while at it, clean up the typemap file that can be empty now.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 bindings/perl/ccs/CCS.xs        |    2 +-
 bindings/perl/ccs/typemap       |   13 -------------
 ccs/libccscompat/libccscompat.h |    2 +-
 config/libs/libccsconfdb/ccs.h  |    2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/bindings/perl/ccs/CCS.xs b/bindings/perl/ccs/CCS.xs
index 6d29dcf..21a651d 100644
--- a/bindings/perl/ccs/CCS.xs
+++ b/bindings/perl/ccs/CCS.xs
@@ -23,7 +23,7 @@ connect(self)
 
 int
 force_connect(self, cluster_name, blocking)
-    char const *cluster_name;
+    const char *cluster_name;
     int blocking;
     CODE:
 	RETVAL = ccs_force_connect(cluster_name, blocking);
diff --git a/bindings/perl/ccs/typemap b/bindings/perl/ccs/typemap
index 267d1e5..02522e8 100644
--- a/bindings/perl/ccs/typemap
+++ b/bindings/perl/ccs/typemap
@@ -1,14 +1 @@
 TYPEMAP
-unsigned int *    T_PTROBJ
-char **           T_PTROBJ
-int *             T_PTROBJ
-char const *      T_PTROBJ
-struct sockaddr_in * T_sockaddr_in
-
-INPUT
-T_sockaddr_in
-    $var = ($type)SvPV($arg,na)
-
-OUTPUT
-T_sockaddr_in
-    sv_setpvn($arg, (char *)$var, sizeof(struct sockaddr_in));
diff --git a/ccs/libccscompat/libccscompat.h b/ccs/libccscompat/libccscompat.h
index 769d046..0daba20 100644
--- a/ccs/libccscompat/libccscompat.h
+++ b/ccs/libccscompat/libccscompat.h
@@ -6,7 +6,7 @@
 #define __CCS_COMPAT_DOT_H__
 
 int ccs_connect(void);
-int ccs_force_connect(char const *cluster_name, int blocking);
+int ccs_force_connect(const char *cluster_name, int blocking);
 int ccs_disconnect(int desc);
 int ccs_get(int desc, const char *query, char **rtn);
 int ccs_get_list(int desc, const char *query, char **rtn);
diff --git a/config/libs/libccsconfdb/ccs.h b/config/libs/libccsconfdb/ccs.h
index d418a07..104efc6 100644
--- a/config/libs/libccsconfdb/ccs.h
+++ b/config/libs/libccsconfdb/ccs.h
@@ -6,7 +6,7 @@
 #define __CCS_DOT_H__
 
 int ccs_connect(void);
-int ccs_force_connect(char const *cluster_name, int blocking);
+int ccs_force_connect(const char *cluster_name, int blocking);
 int ccs_disconnect(int desc);
 int ccs_get(int desc, const char *query, char **rtn);
 int ccs_get_list(int desc, const char *query, char **rtn);



More information about the Cluster-cvs mailing list