A little patch to clean up multiple declarations of the cli_ipcname functions
John Hughes <[email protected]> Mon, 11 Jan 2010 18:34:13 +0100
| Newsgroups | gmane.linux.cluster.ssic.devel |
|---|---|
| Message-ID | <[email protected]> |
some "cli_ipcname_xxx" functions are declared in multiple places. Ugly and error prone. ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ ssic-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ssic-linux-devel
cli_ipcname.patch
(text/x-patch, 3.3 KB)
Index: include/cluster/ssi/namesvr.h =================================================================== RCS file: /usr/local/lib/cvs-repo/openssi-future/include/cluster/ssi/Attic/namesvr.h,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 namesvr.h --- include/cluster/ssi/namesvr.h 20 Jan 2009 16:21:23 -0000 1.1.2.1 +++ include/cluster/ssi/namesvr.h 11 Jan 2010 17:13:01 -0000 @@ -55,5 +55,9 @@ /* extern functions */ extern int cli_ipcname_getid (int, key_t, int, global_id_t *, clusternode_t *, int, int *); +extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *, int *, int *); +extern int cli_ipcname_gettotal(int objtype, struct ssi_nodeid_pair **, int *); +extern int cli_ipcname_rmid(int, global_id_t); + extern cluster_svc_t cluster_ipc_svc; #endif /* !_SSI_NAMESVR_H */ Index: ipc/msg.c =================================================================== RCS file: /usr/local/lib/cvs-repo/openssi-future/ipc/msg.c,v retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.2 msg.c --- ipc/msg.c 29 Dec 2009 19:28:54 -0000 1.1.1.1.2.2 +++ ipc/msg.c 11 Jan 2010 17:14:35 -0000 @@ -37,10 +37,6 @@ #include <cluster/nsc.h> #include <cluster/nodelist.h> -extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *, - int *, int *); -extern int cli_ipcname_gettotal(int objtype, struct ssi_nodeid_pair **, int *); -extern int cli_ipcname_rmid(int service, global_id_t glid); extern int cli_ripc_msgctl(clusternode_t, int *, int, int, ssi_procstate_t *, long *); extern int ssi_msg_get_msg_queue(clusternode_t, int, char **); Index: ipc/sem.c =================================================================== RCS file: /usr/local/lib/cvs-repo/openssi-future/ipc/sem.c,v retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.2 sem.c --- ipc/sem.c 29 Dec 2009 19:28:54 -0000 1.1.1.1.2.2 +++ ipc/sem.c 11 Jan 2010 17:13:57 -0000 @@ -137,16 +137,12 @@ #define sc_semmni (sem_ctls[3]) #ifdef CONFIG_SSI -extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *, - int *, int *); -extern int cli_ipcname_rmid(int, global_id_t); extern int cli_ripc_semctl(clusternode_t, int *, int, int, int, ssi_procstate_t *, union semun *, int); extern int cli_ripc_semop(clusternode_t, int *, int, unsigned, ssi_procstate_t *, ics_userbuf_t *, ics_userbuf_t *); extern int cli_ripc_semexit(clusternode_t, int *, ssi_procstate_t *, int, pid_t); -extern int cli_ipcname_gettotal(int, struct ssi_nodeid_pair **, int *); extern int ssi_sem_get_sem_array(clusternode_t, int, char **); extern clusternode_t name_server_node; Index: ipc/shm.c =================================================================== RCS file: /usr/local/lib/cvs-repo/openssi-future/ipc/shm.c,v retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.3 shm.c --- ipc/shm.c 29 Dec 2009 19:28:54 -0000 1.1.1.1.2.3 +++ ipc/shm.c 11 Jan 2010 17:12:10 -0000 @@ -41,9 +41,6 @@ #include "util.h" #ifdef CONFIG_SSI -extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *, int *, int *); -extern int cli_ipcname_gettotal(int objtype, struct ssi_nodeid_pair **, int *); -extern int cli_ipcname_rmid(int, global_id_t); extern int ssi_shmctl(clusternode_t, int, int, struct shmid_ds *); extern int ssi_shm_get_shmid_kernel(clusternode_t, int, char **, int *, int *); extern int ipc_grow_ary(struct ipc_ids *, int);