Merge branch 'master' of github.com:PolySat/libproc

Author: johnbellardo

Make.rules.Darwin

@@ -1,4 +1,4 @@
 SO_EXT=dylib
-SO_CFLAGS=
+SO_CFLAGS= -D_XOPEN_SOURCE
 SO_LDFLAGS=-dynamiclib -current_version $(MAJOR_VERS).$(MINOR_VERS)
 CFLAG_WARNS=-Wno-format-truncation -Wno-deprecated-declarations

eventTimer.c

@@ -158,8 +158,9 @@ int ET_rtdebug_monotonic(struct EventTimer *arg, struct timeval *tv)
 
    #ifdef __APPLE__
 
-   res = 0
-   gettimeofday(now, NULL)
+   res = 0;
+   // WARNING: Not a monotonic clock, simply a stub for Apple devices.
+   gettimeofday(&now, NULL);
 
    #else
 

plugin.c

@@ -142,7 +142,10 @@ static void configure_set(struct PluginSet *set)
    set->data = data;
    data->set = set;
    c = data->name_lc = strdup(set->prefix);
-   while ((*c++ = tolower(*c)));
+
+   for(int i = 0; c[i]; i++){
+      c[i] = tolower(c[i]);
+   }
 
    if (set->initial_paths) {
       paths = strdup(set->initial_paths);
@@ -215,7 +218,10 @@ static struct PluginList *find_plugin(struct PluginSet *set, const char *name,
    if (len >= sizeof(_name))
       c = name_lc = malloc(len + 1);
    strcpy(name_lc, name);
-   while ((*c++ = tolower(*c)));
+
+   for(int i = 0; c[i]; i++){
+      c[i] = tolower(c[i]);
+   }
 
    for (dirs = set->data->dirs; dirs && dirs->dir; dirs = dirs->next) {
       snprintf(path, sizeof(path), "%s/%s-%s" PL_PLUGIN_SUFFIX, dirs->dir->path,

zmqlite.c

@@ -35,9 +35,10 @@ static char ZMQ_HANDSHAKE_DATA[] = { 0x04, 0x1A, 0x05, 'R', 'E', 'A', 'D', 'Y',
 #define ZMQ_LONG_SIZE 0x2
 #define ZMQ_COMMAND 0x4
 
+#ifndef __APPLE__
 #define htonll(x) ((1==htonl(1)) ? (x) : ((uint64_t)htonl((x) & 0xFFFFFFFF) << 32) | htonl((x) >> 32))
 #define ntohll(x) ((1==ntohl(1)) ? (x) : ((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32))
-
+#endif
 
 struct ZMQLClient {
    int socket;
@@ -201,7 +202,7 @@ int zmql_accept_cb(int fd, char type, void *arg)
       return EVENT_KEEP;
    memset(client, 0, sizeof(*client));
 
-   client->socket = accept(fd, &client->addr, &len);
+   client->socket = accept(fd, (struct sockaddr*) &client->addr, &len);
    if (client->socket == -1) {
       DBG_print(DBG_LEVEL_WARN, "Failed to accept zmql client.");
       free(client);