Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_config_client.c ecore_test.c examine.c exsh.c
Log Message:
Minor changes to ecore_config to make it compile on OS X.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_config_client.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_config_client.c 23 Dec 2003 00:32:05 -0000 1.4
+++ ecore_config_client.c 31 Dec 2003 22:15:32 -0000 1.5
@@ -9,6 +9,7 @@
#include <string.h>
#include <sys/stat.h>
#include <dirent.h>
+#include <limits.h>
#include "ipc.h"
@@ -54,9 +55,9 @@
l=(d[1]<<8)|d[2];
if(*d=='s') {
f=d+3;
- printf(" STR-%d: \"%s\"\n",l,f); }
+ printf(" STR-%ld: \"%s\"\n",l,f); }
else
- printf(" skipping chunk type '%c' {%d bytes}...\n",*d,l);
+ printf(" skipping chunk type '%c' {%ld bytes}...\n",*d,l);
d+=3+l; }
return ECORE_CONFIG_ERR_SUCC; }
@@ -104,7 +105,7 @@
sprintf(str,"%s/.ecore/%s/",p,pipe_name);
snprintf(buf,PATH_MAX,str);
- if(dir=opendir(buf)) {
+ if((dir=opendir(buf))) {
connected=0;
while ((socket=readdir(dir))) {
if (!strcmp(socket->d_name, ".") || !strcmp(socket->d_name, "..") ||
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_test.c 14 Oct 2003 21:59:38 -0000 1.11
+++ ecore_test.c 31 Dec 2003 22:15:32 -0000 1.12
@@ -856,8 +856,8 @@
#ifdef BUILD_ECORE_X
/* setup to test ecore_x module things */
-/* if (!ecore_x_init(NULL)) return -1; */
-/* setup_ecore_x_test(); */
+ if (!ecore_x_init(NULL)) return -1;
+ setup_ecore_x_test();
#endif
#ifdef BUILD_ECORE_EVAS
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/examine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- examine.c 31 Dec 2003 16:25:23 -0000 1.2
+++ examine.c 31 Dec 2003 22:15:32 -0000 1.3
@@ -97,7 +97,7 @@
int ex_ipc_server_sent(void *data,int type,void *event) {
Ewl_Widget *row, *cell[2], *text[2];
- char *label, *type, *start, *end;
+ char *label, *typename, *start, *end;
Ecore_Ipc_Event_Server_Data *e;
e=(Ecore_Ipc_Event_Server_Data *)event;
@@ -138,7 +138,7 @@
start++;
}
start++;
- type = ++start;
+ typename = ++start;
while (*start) {
if (*start == '\n') {
*start = '\0';
@@ -147,18 +147,18 @@
start++;
}
- if (*label && *type) {
+ if (*label && *typename) {
row = ewl_grid_new(2, 1);
cell[0] = ewl_cell_new();
cell[1] = ewl_cell_new();
text[0] = ewl_text_new(label);
- if (!strcmp(type, "string"))
+ if (!strcmp(typename, "string"))
text[1] = ewl_entry_new("<a string>");
- else if (!strcmp(type, "integer"))
+ else if (!strcmp(typename, "integer"))
text[1] = ewl_spinner_new();
else
- text[1] = ewl_text_new(type);
+ text[1] = ewl_text_new(typename);
ewl_object_set_minimum_h(EWL_OBJECT(text[1]), 12);
ewl_container_append_child(EWL_CONTAINER(cell[0]), text[0]);
@@ -250,7 +250,7 @@
-static int handle_any(Ecore_Ipc_Server **server,call *cp,char *line) {
+static int handle_any(ex_ipc_server_list **server,call *cp,char *line) {
long serial=-1;
int ret,pars=0,l=0;
char *b=line,*e,*file=NULL,*k=NULL,*v=NULL,*m=NULL;
@@ -360,12 +360,10 @@
int main(int argc,char **argv) {
- Ecore_Ipc_Server *server=NULL;
- int ret=ECORE_CONFIG_ERR_SUCC,cc=0;
- connstate cs=OFFLINE;
- char *p,*f=NULL;
- char *pipe_name=NULL;
- char buf[MI];
+ ex_ipc_server_list *server=NULL;
+ int ret=ECORE_CONFIG_ERR_SUCC,cc=0;
+ connstate cs=OFFLINE;
+ char *pipe_name=NULL;
if (argc <= 1 || (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0)) {
print_usage();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/exsh.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exsh.c 20 Dec 2003 11:06:43 -0000 1.3
+++ exsh.c 31 Dec 2003 22:15:32 -0000 1.4
@@ -110,7 +110,7 @@
int ex_ipc_server_con(void *data,int type,void *event) {
connstate *cs=(connstate *)data;
*cs=ONLINE;
- E(1,"exsh: Connected .\n"); /*to %s.\n", pipe_name)); */
+ E(1,"exsh: Connected .\n", NULL); /*to %s.\n", pipe_name)); */
return 1; }
@@ -119,7 +119,7 @@
connstate *cs=(connstate *)data;
*cs=OFFLINE;
ecore_main_loop_quit();
- E(1,"exsh: Disconnected.\n");
+ E(1,"exsh: Disconnected.\n", NULL);
return 1; }
@@ -268,7 +268,7 @@
p++;
} while(*p&&*p!='\"');
if(!*p) {
- E(0,"unterminated string in input?\n");
+ E(0,"unterminated string in input?\n", NULL);
*c='\0';
return c; }
else
@@ -531,7 +531,7 @@
printf(IN);
if((f=p=fgets(buf,MI,stdin))) {
#endif
- *q=strchr(p,'\n');
+ q=strchr(p,'\n');
if(q)
*q='\0';
if(!strcasecmp(p,"exit")||!strcasecmp(p,"quit")) {
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
