Fix FreeBSD warnings

git-svn-id: https://klish.googlecode.com/svn/trunk@446 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

clish/callback_config.c

@@ -12,13 +12,13 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <limits.h>
+#include <string.h>
 
 #include "internal.h"
 #include "konf/net.h"
 #include "konf/buf.h"
 #include "konf/query.h"
 #include "lub/string.h"
-#include "clish/variable.h"
 
 static int send_request(konf_client_t * client, char *command);
 

clish/command.h

@@ -54,7 +54,7 @@ const clish_param_t *clish_command__get_args(const clish_command_t * instance);
 clish_action_t *clish_command__get_action(const clish_command_t *instance);
 clish_view_t *clish_command__get_view(const clish_command_t * instance);
 char *clish_command__get_viewid(const clish_command_t *instance);
-const unsigned clish_command__get_param_count(const clish_command_t * instance);
+unsigned int clish_command__get_param_count(const clish_command_t * instance);
 const clish_param_t *clish_command__get_param(const clish_command_t * instance,
 	unsigned index);
 clish_paramv_t *clish_command__get_paramv(const clish_command_t * instance);

clish/command/command.c

@@ -5,7 +5,6 @@
   */
 #include "private.h"
 #include "clish/types.h"
-#include "clish/variable.h"
 #include "lub/bintree.h"
 #include "lub/string.h"
 
@@ -328,7 +327,7 @@ const clish_param_t *clish_command__get_args(const clish_command_t * this)
 }
 
 /*--------------------------------------------------------- */
-const unsigned clish_command__get_param_count(const clish_command_t * this)
+unsigned int clish_command__get_param_count(const clish_command_t * this)
 {
 	return clish_paramv__get_count(this->paramv);
 }

clish/param.h

@@ -74,7 +74,7 @@ clish_param_mode_e clish_param__get_mode(const clish_param_t * instance);
 
 clish_param_t *clish_param__get_param(const clish_param_t * instance,
 				unsigned index);
-const unsigned clish_param__get_param_count(const clish_param_t * instance);
+unsigned int clish_param__get_param_count(const clish_param_t * instance);
 clish_paramv_t *clish_param__get_paramv(clish_param_t * instance);
 void clish_param__set_optional(clish_param_t * instance, bool_t optional);
 bool_t clish_param__get_optional(const clish_param_t * instance);
@@ -93,7 +93,7 @@ void clish_paramv_delete(clish_paramv_t * instance);
 void clish_paramv_insert(clish_paramv_t * instance, clish_param_t * param);
 clish_param_t *clish_paramv__get_param(const clish_paramv_t * instance,
 				unsigned index);
-const unsigned clish_paramv__get_count(const clish_paramv_t * instance);
+unsigned int clish_paramv__get_count(const clish_paramv_t * instance);
 clish_param_t *clish_paramv_find_param(const clish_paramv_t * instance,
 	const char *name);
 const char *clish_paramv_find_default(const clish_paramv_t * instance,

clish/param/param.c

@@ -6,7 +6,6 @@
 #include "private.h"
 #include "lub/string.h"
 #include "clish/types.h"
-#include "clish/variable.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -201,7 +200,7 @@ clish_paramv_t *clish_param__get_paramv(clish_param_t * this)
 }
 
 /*--------------------------------------------------------- */
-const unsigned clish_param__get_param_count(const clish_param_t * this)
+unsigned int clish_param__get_param_count(const clish_param_t * this)
 {
 	return clish_paramv__get_count(this->paramv);
 }
@@ -317,7 +316,7 @@ const char *clish_paramv_find_default(const clish_paramv_t * this,
 }
 
 /*--------------------------------------------------------- */
-const unsigned clish_paramv__get_count(const clish_paramv_t * this)
+unsigned int clish_paramv__get_count(const clish_paramv_t * this)
 {
 	return this->paramc;
 }

clish/shell/private.h

@@ -5,7 +5,6 @@
 #include "tinyrl/tinyrl.h"
 #include "clish/shell.h"
 #include "clish/pargv.h"
-#include "clish/variable.h"
 #include "clish/var.h"
 #include "clish/action.h"
 

clish/view.h

@@ -64,7 +64,7 @@ void clish_view_clean_proxy(clish_view_t * instance);
 const char *clish_view__get_name(const clish_view_t * instance);
 void clish_view__set_prompt(clish_view_t * instance, const char *prompt);
 char *clish_view__get_prompt(const clish_view_t *instance);
-const unsigned clish_view__get_nspace_count(const clish_view_t * instance);
+unsigned int clish_view__get_nspace_count(const clish_view_t * instance);
 clish_nspace_t *clish_view__get_nspace(const clish_view_t * instance,
 				       unsigned index);
 void clish_view__set_depth(clish_view_t * instance, unsigned depth);

clish/view/view.c

@@ -4,7 +4,6 @@
  * This file provides the implementation of a view class
  */
 #include "private.h"
-#include "clish/variable.h"
 #include "lub/argv.h"
 #include "lub/string.h"
 #include "lub/ctype.h"
@@ -353,7 +352,7 @@ clish_nspace_t *clish_view__get_nspace(const clish_view_t * this,
 }
 
 /*--------------------------------------------------------- */
-const unsigned clish_view__get_nspace_count(const clish_view_t * this)
+unsigned int clish_view__get_nspace_count(const clish_view_t * this)
 {
 	return this->nspacec;
 }

lub/list.h

@@ -73,8 +73,8 @@ void lub_list_free(lub_list_t *list);
 void lub_list_node_free(lub_list_node_t *node);
 inline lub_list_node_t *lub_list__get_head(lub_list_t *list);
 inline lub_list_node_t *lub_list__get_tail(lub_list_t *list);
-lub_list_node_t *lub_list_node__get_prev(lub_list_node_t *node);
-lub_list_node_t *lub_list_node__get_next(lub_list_node_t *node);
+inline lub_list_node_t *lub_list_node__get_prev(lub_list_node_t *node);
+inline lub_list_node_t *lub_list_node__get_next(lub_list_node_t *node);
 void *lub_list_node__get_data(lub_list_node_t *node);
 lub_list_node_t *lub_list_iterator_init(lub_list_t *list);
 lub_list_node_t *lub_list_iterator_next(lub_list_node_t *node);