patches13/0015-fixed-some-compiler-warnings.patch

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7061 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/UTIL/CLI/cli.h

@@ -128,10 +128,12 @@ char g_sid[MAX_SID];
 int com_help (char * arg);
 int com_exit (char *arg);
 
-int prompt(char *arg),prompt_usage(void), info(char *arg);
+int prompt(char *arg);
+int prompt_usage(char *);
+int info(char *arg);
 
 int start(char *arg), set(char *arg);
-int start_usage(void), set_usage(void);
+int start_usage(char *), set_usage(void);
 
 /* Forward declarations. */
 char *stripwhite (char *string);

openair2/UTIL/CLI/cli_cmd.c

@@ -136,7 +136,7 @@ int start (char *arg) {
     return OK;
   
   if (valid_argument ("start", arg) == ERR){
-    start_usage();
+    start_usage("");
     return ERR;
   }
   
@@ -272,13 +272,13 @@ int process_argument(int optc, char* optv[]) {
 }
 
 
-int prompt_usage(void) {
+int prompt_usage(char *arg) {
   sprintf(buffer, "Usage: prompt [value]\n");
   send(cli_cfg->cfd, buffer, strlen(buffer), 0);
   
   return 0;
 }
-int start_usage(void) {
+int start_usage(char *arg) {
   sprintf(buffer, "Usage: start [enb|UE] [enb_index][0: stop, 1: start] \n");
   send(cli_cfg->cfd, buffer, strlen(buffer), 0);
   sprintf(buffer, "Example to start enb 0: start enb 0 1 \n");

openair2/UTIL/OCG/OCG.c

@@ -182,7 +182,7 @@ int OCG_main(char is_local_server[FILENAME_LENGTH_MAX]) {
 					strcat(output_dir, file_date);
 					strcat(output_dir, "/");
 					strcpy(dst_dir, output_dir);
-					oai_emulation.info.output_path = &dst_dir; // information for other modules within OAI
+					oai_emulation.info.output_path = dst_dir; // information for other modules within OAI
 				} else state = STATE_GENERATE_REPORT;
 				break;
 				

openair2/UTIL/OMG/mobility_parser.c

@@ -44,6 +44,7 @@
 #include "mobility_parser.h"
 #include "omg.h"
 #include <math.h>
+#include "assertions.h"
 
 extern hash_table_t **table;
 extern node_info **list_head;
@@ -264,4 +265,6 @@ get_next_data (hash_table_t * table, int vid, int flag)
     }
   else
     return links;
+
+  DevAssert(false); // FIXME return 0?
 }