From 8075905bc86fa242071128d0d2d7a582cc7c4907 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 29 Mar 2008 17:44:40 +0000 Subject: [PATCH 1/3] Remove options MK_LIBKSE and DEFAULT_THREAD_LIB now that we no longer build libkse. This should fix WITHOUT_LIBTHR builds as a side effect. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 38ca2f2..8f889f1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SUBDIR= ${_ggatec} \ ${_ggated} \ ggatel -.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" +.if ${MK_LIBTHR} != "no" _ggatec= ggatec _ggated= ggated .endif From a87d6e404d765e5106c3a956125bd34adc9d42c3 Mon Sep 17 00:00:00 2001 From: gonzo Date: Fri, 20 Jun 2008 21:41:44 +0000 Subject: [PATCH 2/3] Fix spelling PR: kern/124723 Event: Bugathon#5 --- ggated/ggated.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggated/ggated.c b/ggated/ggated.c index b211ccc..74784e7 100644 --- a/ggated/ggated.c +++ b/ggated/ggated.c @@ -211,10 +211,10 @@ line_parse(char *line, unsigned lineno) ex = malloc(sizeof(*ex)); if (ex == NULL) - g_gate_xlog("No enough memory."); + g_gate_xlog("Not enough memory."); ex->e_path = strdup(path); if (ex->e_path == NULL) - g_gate_xlog("No enough memory."); + g_gate_xlog("Not enough memory."); /* Made 'and' here. */ ex->e_ip = (ip & mask); From b93805e89673bf86eefe81dc1b59b54312385c2e Mon Sep 17 00:00:00 2001 From: mtm Date: Thu, 26 Jun 2008 07:05:35 +0000 Subject: [PATCH 3/3] The signature for a pthread function requires that it return a pointer to a void. The send_thread() and disk_thread() funtions; however, do not have a return value because they run for the duration of the daemon's lifetime. This causes gcc to barf when running with -O3. Make these functions return a null pointer to quiet it. PR: bin/124342 Submitted by: Garrett Cooper (minus his comments) MFC after: 1 week --- ggated/ggated.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ggated/ggated.c b/ggated/ggated.c index 74784e7..52d2428 100644 --- a/ggated/ggated.c +++ b/ggated/ggated.c @@ -756,6 +756,9 @@ disk_thread(void *arg) error = pthread_mutex_unlock(&outqueue_mtx); assert(error == 0); } + + /* NOTREACHED */ + return (NULL); } static void * @@ -810,6 +813,9 @@ send_thread(void *arg) } free(req); } + + /* NOTREACHED */ + return (NULL); } static void