From: Kevin Lyles <iqgryn@users.sourceforge.net>
Date: Wed, 20 Feb 2008 10:01:00 +0000 (+0000)
Subject: Added missing break statements and a missing freebsd kernel check
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=32c8f71eaa82986b91b8156ed396c80224d77ede;p=monky

Added missing break statements and a missing freebsd kernel check


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1003 7f574dfc-610e-0410-a909-a81674777703
---

diff --git a/src/conky.c b/src/conky.c
index 0219f16..d006f10 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -2055,6 +2055,7 @@ static void free_text_objects(unsigned int count, struct text_object *objs)
 			case OBJ_bmpx_track:
 			case OBJ_bmpx_uri:
 			case OBJ_bmpx_bitrate:
+				break;
 #endif
 #ifdef RSS
 			case OBJ_rss:
@@ -2063,6 +2064,7 @@ static void free_text_objects(unsigned int count, struct text_object *objs)
 				break;
 #endif
 			case OBJ_pre_exec:
+				break;
 #ifndef __OpenBSD__
 			case OBJ_battery:
 				free(objs[i].data.s);
@@ -7919,7 +7921,8 @@ int main(int argc, char **argv)
 
 	/* handle other command line arguments */
 
-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+		|| defined(__NetBSD__)
 	optind = optreset = 1;
 #else
 	optind = 0;