diff options
| author | buisson | 2002-06-21 13:00:23 +0000 |
|---|---|---|
| committer | buisson | 2002-06-21 13:00:23 +0000 |
| commit | f5c741d775994c7ee1e57576505d89f3ce1d8ffd (patch) | |
| tree | f896cd77fbee06c3404561571c774ddc82a39160 /src | |
| parent | 55ff55424ecea50f8b8c2f171195f6a7da8574c4 (diff) | |
| download | ivy-c-f5c741d775994c7ee1e57576505d89f3ce1d8ffd.zip ivy-c-f5c741d775994c7ee1e57576505d89f3ce1d8ffd.tar.gz ivy-c-f5c741d775994c7ee1e57576505d89f3ce1d8ffd.tar.bz2 ivy-c-f5c741d775994c7ee1e57576505d89f3ce1d8ffd.tar.xz | |
Line 110, 114, 118 : add "void" to *expr
Line 205 : cast argument to int for osx compatibility with int_64
Diffstat (limited to 'src')
| -rw-r--r-- | src/ivy.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -39,7 +39,7 @@ #define ARG_START "\002" #define ARG_END "\003" -#define DEFAULT_DOMAIN 127.255.255.255 +#define DEFAULT_DOMAIN "127.255.255.255" /* stringification et concatenation du domaine et du port en 2 temps : * Obligatoire puisque la substitution de domain, et de bus n'est pas @@ -107,15 +107,15 @@ static const char **messages_classes = 0; /* callback appele sur reception d'un message direct */ static MsgDirectCallback direct_callback = 0; -static *direct_user_data = 0; +static void *direct_user_data = 0; /* callback appele sur changement d'etat d'application */ static IvyApplicationCallback application_callback; -static *application_user_data = 0; +static void *application_user_data = 0; /* callback appele sur demande de terminaison d'application */ static IvyDieCallback application_die_callback; -static *application_die_user_data = 0; +static void *application_die_user_data = 0; /* liste des messages a recevoir */ static MsgRcvPtr msg_recv = 0; @@ -187,7 +187,7 @@ MsgCall (const char *message, MsgSndPtr msg, Client client) SocketSend( client, "%d %d" ARG_START ,Msg, msg->id); #ifdef DEBUG - printf( "Send matching args count %d\n",msg->regexp.re_nsub); + printf( "Send matching args count %ld\n",msg->regexp.re_nsub); #endif //DEBUG #ifdef GNU_REGEXP @@ -202,10 +202,10 @@ MsgCall (const char *message, MsgSndPtr msg, Client client) if ( match[i].rm_so != -1 ) { #ifdef DEBUG printf ("Send matching arg%d %d %d\n",i,match[i].rm_so , match[i].rm_eo); - printf ("Send matching arg%d %.*s\n",i,match[i].rm_eo - match[i].rm_so, + printf ("Send matching arg%d %.*s\n",i,(int)(match[i].rm_eo - match[i].rm_so), message + match[i].rm_so); #endif - SocketSend (client, "%.*s" ARG_END ,match[i].rm_eo - match[i].rm_so, + SocketSend (client, "%.*s" ARG_END ,(int)(match[i].rm_eo - match[i].rm_so), message + match[i].rm_so); } else { SocketSend (client, ARG_END); @@ -579,6 +579,7 @@ void IvyClasses( int argc, const char **argv) void IvyStart (const char* bus) { + struct in_addr baddr; unsigned long mask = 0xffffffff; unsigned char elem = 0; @@ -648,6 +649,7 @@ void IvyStart (const char* bus) /* addresses are terminated by a comma or end of string */ } else { + baddr.s_addr = htonl(mask); printf ("Broadcasting on network %s, port %d\n", inet_ntoa(baddr), SupervisionPort); // test mask value agaisnt CLASS D |