Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/examine
Dir : e17/apps/examine/src
Modified Files:
ecore_config_client.c ecore_config_client.h examine.c
examine_client.c examine_client.h exsh.c ipc.h
Log Message:
More namespace cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/ecore_config_client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_config_client.c 13 Jan 2004 19:51:50 -0000 1.2
+++ ecore_config_client.c 3 Mar 2004 23:51:29 -0000 1.3
@@ -88,7 +88,8 @@
int
-ex_ipc_init(ex_ipc_server_list ** srv_list, char *pipe_name, connstate * cs)
+ecore_config_ipc_init(Ecore_Config_Ipc_Server_List ** srv_list, char *pipe_name,
+ connstate * cs)
{
int global , port, connected;
struct stat st;
@@ -97,7 +98,7 @@
DIR *dir;
struct dirent *socket;
Ecore_Ipc_Server *tmp_sock;
- ex_ipc_server_list *tmp;
+ Ecore_Config_Ipc_Server_List *tmp;
global = FALSE;
@@ -136,9 +137,9 @@
ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, pipe_name, port,
NULL))) {
E(2, "- connected!\n");
- if (!(tmp = malloc(sizeof(ex_ipc_server_list))))
+ if (!(tmp = malloc(sizeof(Ecore_Config_Ipc_Server_List))))
return ECORE_CONFIG_ERR_OOM;
- memset(tmp, 0, sizeof(ex_ipc_server_list));
+ memset(tmp, 0, sizeof(Ecore_Config_Ipc_Server_List));
tmp->srv = tmp_sock;
if (!*srv_list)
@@ -166,12 +167,12 @@
if (connected) {
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, ex_ipc_server_con,
- cs);
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, ex_ipc_server_dis,
- cs);
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, ex_ipc_server_sent,
- NULL);
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD,
+ ecore_config_ipc_server_con, cs);
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL,
+ ecore_config_ipc_server_dis, cs);
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA,
+ ecore_config_ipc_server_sent, NULL);
return ECORE_CONFIG_ERR_SUCC;
}
@@ -180,15 +181,15 @@
if ((tmp_sock =
ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, pipe_name, 0, NULL))) {
E(2, "Connected to %s on default port (0)!\n", pipe_name);
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, ex_ipc_server_con,
- cs);
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, ex_ipc_server_dis,
- cs);
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, ex_ipc_server_sent,
- NULL);
- if (!(tmp = malloc(sizeof(ex_ipc_server_list))))
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD,
+ ecore_config_ipc_server_con, cs);
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL,
+ ecore_config_ipc_server_dis, cs);
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA,
+ ecore_config_ipc_server_sent, NULL);
+ if (!(tmp = malloc(sizeof(Ecore_Config_Ipc_Server_List))))
return ECORE_CONFIG_ERR_OOM;
- memset(tmp, 0, sizeof(ex_ipc_server_list));
+ memset(tmp, 0, sizeof(Ecore_Config_Ipc_Server_List));
tmp->srv = tmp_sock;
if (!*srv_list)
@@ -205,9 +206,9 @@
int
-ex_ipc_exit(ex_ipc_server_list ** srv_list)
+ecore_config_ipc_exit(Ecore_Config_Ipc_Server_List ** srv_list)
{
- ex_ipc_server_list *tmp = *srv_list;
+ Ecore_Config_Ipc_Server_List *tmp = *srv_list;
if (!srv_list)
return ECORE_CONFIG_ERR_FAIL;
@@ -224,7 +225,7 @@
int
-ex_ipc_sigexit(void *data, int type, void *event)
+ecore_config_ipc_sigexit(void *data, int type, void *event)
{
return 0;
}
@@ -236,10 +237,10 @@
int
-ex_ipc_send(ex_ipc_server_list ** srv_list, int major, int minor, void *data,
- int size)
+ecore_config_ipc_send(Ecore_Config_Ipc_Server_List ** srv_list, int major,
+ int minor, void *data, int size)
{
- ex_ipc_server_list *tmp = *srv_list;
+ Ecore_Config_Ipc_Server_List *tmp = *srv_list;
static int ref = 0;
int ret;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/ecore_config_client.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_config_client.h 13 Jan 2004 19:51:50 -0000 1.2
+++ ecore_config_client.h 3 Mar 2004 23:51:29 -0000 1.3
@@ -1,24 +1,24 @@
typedef enum { OFFLINE, ONLINE } connstate;
-typedef struct ex_ipc_server_list {
+typedef struct Ecore_Config_Ipc_Server_List {
Ecore_Ipc_Server *srv;
connstate state;
- struct ex_ipc_server_list *next;
-} ex_ipc_server_list;
+ struct Ecore_Config_Ipc_Server_List *next;
+} Ecore_Config_Ipc_Server_List;
/* in client */
-int ex_ipc_server_con(void *data, int type, void *event);
-int ex_ipc_server_dis(void *data, int type, void *event);
-int ex_ipc_server_sent(void *data, int type, void *event);
+int ecore_config_ipc_server_con(void *data, int type, void *event);
+int ecore_config_ipc_server_dis(void *data, int type, void *event);
+int ecore_config_ipc_server_sent(void *data, int type, void *event);
/* in client lib */
const char *ecore_config_error(int no);
-int ex_ipc_init(ex_ipc_server_list ** srv_list, char *pipe_name,
- connstate * cs);
-int ex_ipc_exit(ex_ipc_server_list ** srv_list);
-int ex_ipc_sigexit(void *data, int type, void *event);
-int ex_ipc_send(ex_ipc_server_list ** srv_list, int major,
- int minor, void *data, int size);
+int ecore_config_ipc_init(Ecore_Config_Ipc_Server_List ** srv_list,
+ char *pipe_name, connstate * cs);
+int ecore_config_ipc_exit(Ecore_Config_Ipc_Server_List ** srv_list);
+int ecore_config_ipc_sigexit(void *data, int type, void *event);
+int ecore_config_ipc_send(Ecore_Config_Ipc_Server_List ** srv_list,
+ int major, int minor, void *data, int size);
int send_append(char **mp, int *lp, char *dp);
extern int debug;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- examine.c 24 Feb 2004 20:59:40 -0000 1.6
+++ examine.c 3 Mar 2004 23:51:29 -0000 1.7
@@ -53,7 +53,8 @@
ecore_init();
ecore_app_args_set(argc, (const char **) argv);
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ex_ipc_sigexit, &cs);
+ ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ecore_config_ipc_sigexit,
+ &cs);
ewl_init(&argc, argv);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- examine_client.c 23 Feb 2004 23:37:51 -0000 1.2
+++ examine_client.c 3 Mar 2004 23:51:29 -0000 1.3
@@ -15,14 +15,14 @@
char *examine_client_buf;
-ex_ipc_server_list *examine_client_server;
+Ecore_Config_Ipc_Server_List *examine_client_server;
examine_prop *prop_list;
/*****************************************************************************/
int
-ex_ipc_server_con(void *data, int type, void *event)
+ecore_config_ipc_server_con(void *data, int type, void *event)
{
connstate *cs = (connstate *) data;
@@ -34,7 +34,7 @@
int
-ex_ipc_server_dis(void *data, int type, void *event)
+ecore_config_ipc_server_dis(void *data, int type, void *event)
{
connstate *cs = (connstate *) data;
@@ -47,7 +47,7 @@
int
-ex_ipc_server_sent(void *data, int type, void *event)
+ecore_config_ipc_server_sent(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e;
@@ -137,7 +137,7 @@
send_append(&m, &l, key);
if (val)
send_append(&m, &l, val);
- ret = ex_ipc_send(&examine_client_server, c->id, serial, m, l);
+ ret = ecore_config_ipc_send(&examine_client_server, c->id, serial, m, l);
if (m)
free(m);
}
@@ -371,11 +371,11 @@
int
examine_client_init(char *pipe_name, connstate * cs)
{
- return ex_ipc_init(&examine_client_server, pipe_name, cs);
+ return ecore_config_ipc_init(&examine_client_server, pipe_name, cs);
}
int
examine_client_exit(void)
{
- return ex_ipc_exit(&examine_client_server);
+ return ecore_config_ipc_exit(&examine_client_server);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- examine_client.h 23 Feb 2004 23:37:51 -0000 1.2
+++ examine_client.h 3 Mar 2004 23:51:29 -0000 1.3
@@ -15,7 +15,7 @@
typedef struct _call {
- ex_ipc_call id;
+ Ecore_Config_Ipc_Call id;
char *name;
para signature;
} call;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/exsh.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exsh.c 14 Jan 2004 23:17:35 -0000 1.3
+++ exsh.c 3 Mar 2004 23:51:29 -0000 1.4
@@ -67,7 +67,7 @@
typedef struct _call {
- ex_ipc_call id;
+ Ecore_Config_Ipc_Call id;
char *name;
para signature;
const char *help;
@@ -131,7 +131,7 @@
int
-ex_ipc_server_con(void *data, int type, void *event)
+ecore_config_ipc_server_con(void *data, int type, void *event)
{
connstate *cs = (connstate *) data;
@@ -143,7 +143,7 @@
int
-ex_ipc_server_dis(void *data, int type, void *event)
+ecore_config_ipc_server_dis(void *data, int type, void *event)
{
connstate *cs = (connstate *) data;
@@ -156,7 +156,7 @@
int
-ex_ipc_server_sent(void *data, int type, void *event)
+ecore_config_ipc_server_sent(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e = (Ecore_Ipc_Event_Server_Data *) event;
@@ -250,7 +250,7 @@
static int
-handle_any(ex_ipc_server_list ** server_list, call * cp, char *line)
+handle_any(Ecore_Config_Ipc_Server_List ** server_list, call * cp, char *line)
{
long serial = -1;
int ret, pars = 0, l = 0;
@@ -296,7 +296,7 @@
E(3, "found \"%s\" |serial:%ld|file:%s|key:%s|value:%s|\n", cp->name, serial,
file, k, v);
- ret = ex_ipc_send(server_list, cp->id, serial, m, l);
+ ret = ecore_config_ipc_send(server_list, cp->id, serial, m, l);
if (m)
free(m);
return ret;
@@ -490,7 +490,7 @@
static int
-parse_line(ex_ipc_server_list ** server_list, char *line)
+parse_line(Ecore_Config_Ipc_Server_List ** server_list, char *line)
{
call *cp = NULL;
char *c = NULL, *b = line, *e = NULL, *p;
@@ -579,7 +579,7 @@
int
main(int argc, char **argv)
{
- ex_ipc_server_list *server;
+ Ecore_Config_Ipc_Server_List *server;
int ret, cc;
connstate cs;
char *p, *f, *q;
@@ -622,11 +622,11 @@
ecore_init();
ecore_app_args_set(argc, (const char **) argv);
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ex_ipc_sigexit, &cs);
+ ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ecore_config_ipc_sigexit, &cs);
reconnect:
cc++;
- if ((ret = ex_ipc_init(&server, pipe_name, &cs)) != ECORE_CONFIG_ERR_SUCC)
+ if ((ret = ecore_config_ipc_init(&server, pipe_name, &cs)) != ECORE_CONFIG_ERR_SUCC)
E(0, "exsh: %sconnect to %s failed: %d\n", (cc > 1) ? "re" : "", pipe_name,
ret);
else {
@@ -634,7 +634,7 @@
p = NULL;
ecore_main_loop_iterate();
if (cs == OFFLINE) {
- ex_ipc_exit(&server);
+ ecore_config_ipc_exit(&server);
cs = ONLINE;
goto reconnect;
}
@@ -665,7 +665,7 @@
}
}
- ex_ipc_exit(&server);
+ ecore_config_ipc_exit(&server);
ecore_shutdown();
#ifdef HAVE_READLINE_HISTORY
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/ipc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ipc.h 23 Feb 2004 23:37:51 -0000 1.2
+++ ipc.h 3 Mar 2004 23:51:29 -0000 1.3
@@ -15,21 +15,18 @@
IPC_BUNDLE_LABEL_FIND,
IPC_LAST
-} ex_ipc_call;
+} Ecore_Config_Ipc_Call;
-Ecore_Config_Server *srv2ecore_config_srv(void *srv);
+Ecore_Config_Server *_ecore_config_server_convert(void *srv);
-char *ipc_prop_list(Ecore_Config_Server * srv, const long serial);
-char *ipc_prop_desc(Ecore_Config_Server * srv, const long serial,
- const char *key);
-char *ipc_prop_get(Ecore_Config_Server * srv, const long serial,
- const char *key);
-int ipc_prop_set(Ecore_Config_Server * srv, const long serial,
- const char *key, const char *val);
+char *_ecore_config_ipc_prop_list(Ecore_Config_Server *srv, const long serial);
+char *_ecore_config_ipc_prop_desc(Ecore_Config_Server *srv, const long serial,const
char *key);
+char *_ecore_config_ipc_prop_get(Ecore_Config_Server *srv, const long serial,const
char *key);
+int _ecore_config_ipc_prop_set(Ecore_Config_Server *srv, const long serial,const
char *key,const char *val);
+
+char *_ecore_config_ipc_bundle_list(Ecore_Config_Server *srv);
+int _ecore_config_ipc_bundle_new(Ecore_Config_Server *srv, const char *);
+char *_ecore_config_ipc_bundle_label_get(Ecore_Config_Server *srv, const long);
+int _ecore_config_ipc_bundle_label_set(Ecore_Config_Server *srv, const long,const
char *);
+long _ecore_config_ipc_bundle_label_find(Ecore_Config_Server *srv, const char *);
-char *ipc_bundle_list(Ecore_Config_Server * srv);
-int ipc_bundle_new(Ecore_Config_Server * srv, const char *);
-char *ipc_bundle_label_get(Ecore_Config_Server * srv, const long);
-int ipc_bundle_label_set(Ecore_Config_Server * srv, const long,
- const char *);
-long ipc_bundle_label_find(Ecore_Config_Server * srv, const char *);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
