@@ -39,7 +39,7 @@ static char *user = NULL; static int detach = 0; static int port = 11300; -static struct in_addr host_addr = { INADDR_ANY }; +static struct in_addr host_addr; static void nullfd(int fd, int flags) @@ -261,6 +261,8 @@ main(int argc, char **argv) struct event_base *ev_base; struct job binlog_jobs = {}; + host_addr.s_addr = INADDR_ANY; + progname = argv[0]; opts(argc, argv); beanstalkd.c @@ -244,7 +244,7 @@ make_binlog(char *path) binlog b; b = (binlog) malloc(sizeof(struct binlog) + strlen(path) + 1); - if (!b) return twarnx("OOM"), NULL; + if (!b) return twarnx("OOM"), (binlog) 0; strcpy(b->path, path); b->refs = 0; b->next = NULL; @@ -260,7 +260,7 @@ make_next_binlog() if (!binlog_dir) return NULL; r = snprintf(path, PATH_MAX, "%s/binlog.%d", binlog_dir, ++binlog_index); - if (r > PATH_MAX) return twarnx("path too long: %s", binlog_dir), NULL; + if (r > PATH_MAX) return twarnx("path too long: %s", binlog_dir), (binlog)0; return make_binlog(path); } binlog.c @@ -69,12 +69,12 @@ make_conn(int fd, char start_state, tube use, tube watch) conn c; c = conn_alloc(); - if (!c) return twarn("OOM"), NULL; + if (!c) return twarn("OOM"), (conn) 0; ms_init(&c->watch, (ms_event_fn) on_watch, (ms_event_fn) on_ignore); if (!ms_append(&c->watch, watch)) { conn_free(c); - return twarn("OOM"), NULL; + return twarn("OOM"), (conn) 0; } c->use = NULL; /* initialize */ conn.c @@ -106,7 +106,7 @@ allocate_job(int body_size) job j; j = malloc(sizeof(struct job) + body_size); - if (!j) return twarnx("OOM"), NULL; + if (!j) return twarnx("OOM"), (job) 0; j->id = 0; j->state = JOB_STATE_INVALID; @@ -130,7 +130,7 @@ make_job_with_id(unsigned int pri, unsigned int delay, unsigned int ttr, job j; j = allocate_job(body_size); - if (!j) return twarnx("OOM"), NULL; + if (!j) return twarnx("OOM"), (job) 0; if (id) { j->id = id; @@ -203,7 +203,7 @@ job_copy(job j) if (!j) return NULL; n = malloc(sizeof(struct job) + j->body_size); - if (!n) return twarnx("OOM"), NULL; + if (!n) return twarnx("OOM"), (job) 0; memcpy(n, j, sizeof(struct job) + j->body_size); n->next = n->prev = n; /* not in a linked list */ job.c @@ -186,7 +186,7 @@ size_t job_data_size_limit = JOB_DATA_SIZE_LIMIT_DEFAULT; "current-workers: %u\n" \ "current-waiting: %u\n" \ "total-connections: %u\n" \ - "pid: %u\n" \ + "pid: %ld\n" \ "version: %s\n" \ "rusage-utime: %d.%06d\n" \ "rusage-stime: %d.%06d\n" \ @@ -839,7 +839,7 @@ fmt_stats(char *buf, size_t size, void *x) count_cur_workers(), global_stat.waiting_ct, count_tot_conns(), - getpid(), + (long) getpid(), VERSION, (int) ru.ru_utime.tv_sec, (int) ru.ru_utime.tv_usec, (int) ru.ru_stime.tv_sec, (int) ru.ru_stime.tv_usec, prot.c @@ -92,7 +92,7 @@ make_and_insert_tube(const char *name) /* We want this global tube list to behave like "weak" refs, so don't * increment the ref count. */ r = ms_append(&tubes, t); - if (!r) return tube_dref(t), NULL; + if (!r) return tube_dref(t), (tube) 0; return t; } tube.c 99d11915a28389a1fb2bd9413d9f9b574b6f88ba Keith Rarick kr@xph.us http://github.com/kr/beanstalkd/commit/9c61ad0f3d9f5f6718bbc09015af385704f6bdd5 9c61ad0f3d9f5f6718bbc09015af385704f6bdd5 2009-05-15T16:00:43-07:00 2009-05-15T16:00:43-07:00 Fix compiler warnings from gcc 3.4.3 on Solaris. 24702f6060f668466e6b842e4e409b88faf4665a Keith Rarick kr@xph.us