Merge pull request #92 from yutaro-sakamoto/fix/warnings

Author: yutaro-sakamoto

bin/cobjrun.c

@@ -24,6 +24,7 @@
 
 #include	<stdio.h>
 #include	<string.h>
+#include	<stdlib.h>
 
 #include	"tarstamp.h"
 

cobj/cobj.c

@@ -163,7 +163,7 @@ int cb_saveargc;
 char **cb_saveargv;
 
 const char *cob_config_dir;
-extern char *cb_java_package_name = NULL;
+char *cb_java_package_name = NULL;
 
 char edit_code_command[512];
 char edit_code_command_is_set = 0;
@@ -235,15 +235,6 @@ static const char *cob_tmpdir; /* /tmp */
 
 static struct filename *file_list;
 
-/* NOTE fcopts MUST have at least one leading space */
-#if defined(__GNUC__) && (__GNUC__ >= 3)
-static const char fcopts[] = " -finline-functions -fno-gcse -freorder-blocks ";
-#elif defined(__xlc__)
-static const char fcopts[] = " -Q -qro -qroconst ";
-#else
-static const char fcopts[] = " ";
-#endif
-
 #if defined(__GNUC__) && (__GNUC__ >= 3)
 static const char gccpipe[] = "-pipe";
 #else
@@ -1526,25 +1517,12 @@ static int preprocess(struct filename *fn) {
   return 0;
 }
 
-static struct cb_program *program_list_reverse(struct cb_program *p) {
-  struct cb_program *next;
-  struct cb_program *last = NULL;
-
-  for (; p; p = next) {
-    next = p->next_program;
-    p->next_program = last;
-    last = p;
-  }
-  return last;
-}
-
 static int process_translate(struct filename *fn) {
   struct cb_program *p;
   struct cb_program *q;
   struct cb_program *r;
   struct handler_struct *hstr1;
   struct handler_struct *hstr2;
-  struct local_filename *lf;
   int ret;
   int i;
 
@@ -1643,30 +1621,6 @@ static int process_compile(struct filename *fn) {
   return ret;
 }
 
-/* Create single-element assembled object */
-
-static int process_assemble(struct filename *fn) {
-  char buff[COB_MEDIUM_BUFF];
-
-#ifdef _MSC_VER
-  sprintf(buff,
-          gflag_set ? "%s /c %s %s /Od /MDd /Zi /FR /Fo\"%s\" \"%s\""
-                    : "%s /c %s %s /MD /Fo\"%s\" \"%s\"",
-          cob_cc, cob_java_flags, cob_define_flags, fn->object, fn->translate);
-#else
-  if (cb_compile_level == CB_LEVEL_MODULE ||
-      cb_compile_level == CB_LEVEL_LIBRARY) {
-    sprintf(buff, "%s %s -c %s %s %s -o \"%s\" \"%s\"", cob_cc, gccpipe,
-            cob_java_flags, cob_define_flags, COB_PIC_FLAGS, fn->object,
-            fn->translate);
-  } else {
-    sprintf(buff, "%s %s -c %s %s -o \"%s\" \"%s\"", cob_cc, gccpipe,
-            cob_java_flags, cob_define_flags, fn->object, fn->translate);
-  }
-#endif
-  return process(buff);
-}
-
 static int process_build_module(struct filename *fn) {
   int ret;
   char buff[COB_MEDIUM_BUFF];
@@ -1710,66 +1664,6 @@ static int process_build_module(struct filename *fn) {
   return ret;
 }
 
-/* Create single-element loadable object */
-
-static int process_module(struct filename *fn) {
-  int ret;
-  char buff[COB_MEDIUM_BUFF];
-  char name[COB_MEDIUM_BUFF];
-
-  if (output_name) {
-    strcpy(name, output_name);
-#if defined(_MSC_VER)
-    file_stripext(name);
-#else
-    if (strchr(output_name, '.') == NULL) {
-      strcat(name, ".");
-      strcat(name, COB_MODULE_EXT);
-    }
-#endif
-  } else {
-    file_basename(fn->source, name);
-#if !defined(_MSC_VER)
-    strcat(name, ".");
-    strcat(name, COB_MODULE_EXT);
-#endif
-  }
-#ifdef _MSC_VER
-  sprintf(buff,
-          gflag_set ? "%s /Od /MDd /LDd /Zi /FR /Fe\"%s\" %s \"%s\" %s"
-                    : "%s /MD /LD /Fe\"%s\" %s \"%s\" %s",
-          cob_cc, name, cob_ldflags, fn->object, cob_libs);
-  ret = process(buff);
-#if _MSC_VER >= 1400
-  /* Embedding manifest */
-  if (ret == 0) {
-    sprintf(buff,
-            "%s /manifest \"%s.dll.manifest\" /outputresource:\"%s.dll\";#2",
-            manicmd, name, name);
-    ret = process(buff);
-    sprintf(buff, "%s.dll.manifest", name);
-    cobc_check_action(buff);
-  }
-#endif
-  sprintf(buff, "%s.exp", name);
-  cobc_check_action(buff);
-  sprintf(buff, "%s.lib", name);
-  cobc_check_action(buff);
-#else /* _MSC_VER */
-  sprintf(buff, "%s %s %s %s %s %s -o %s %s %s", cob_cc, gccpipe,
-          COB_SHARED_OPT, cob_ldflags, COB_PIC_FLAGS, COB_EXPORT_DYN, name,
-          fn->object, cob_libs);
-  ret = process(buff);
-#ifdef COB_STRIP_CMD
-  if (strip_output && ret == 0) {
-    sprintf(buff, "%s %s", COB_STRIP_CMD, name);
-    ret = process(buff);
-  }
-#endif
-#endif /* _MSC_VER */
-  return ret;
-}
-
 static int process_library(struct filename *l) {
   char *buffptr;
   char *objsptr;

cobj/codegen.c

@@ -163,9 +163,9 @@ int param_wrap_string_flag = 0;
 static char *get_java_identifier_field(struct cb_field *f);
 static char *get_java_identifier_base(struct cb_field *f);
 static void get_java_identifier_helper(struct cb_field *f, char *buf);
-static void strcpy_identifier_cobol_to_java(char *buf, char *identifier);
+static void strcpy_identifier_cobol_to_java(char *buf, const char *identifier);
 void joutput_execution_list(struct cb_program *prog);
-void joutput_execution_entry_func();
+void joutput_execution_entry_func(void);
 void joutput_init_method(struct cb_program *prog);
 void joutput_declare_member_variables(struct cb_program *prog,
                                       cb_tree parameter_list);
@@ -174,8 +174,8 @@ char *convert_byte_value_format(char value);
 void append_label_id_map(struct cb_label *label);
 void create_label_id_map(struct cb_program *prog);
 int find_label_id(struct cb_label *label);
-void destroy_label_id_map();
-void joutput_edit_code_command(const char *option);
+void destroy_label_id_map(void);
+void joutput_edit_code_command(const char *target);
 
 const int EXECUTION_NORMAL = 0;
 const int EXECUTION_LAST = 1;
@@ -220,7 +220,7 @@ static void get_java_identifier_helper(struct cb_field *f, char *buf) {
   }
 }
 
-static void strcpy_identifier_cobol_to_java(char *buf, char *identifier) {
+static void strcpy_identifier_cobol_to_java(char *buf, const char *identifier) {
   for (; *identifier != '\0'; ++identifier, ++buf) {
     if (*identifier == '-') {
       *buf = '_';
@@ -296,18 +296,6 @@ static struct literal_list *literal_list_reverse(struct literal_list *p) {
   return last;
 }
 
-static struct local_list *local_list_reverse(struct local_list *p) {
-  struct local_list *next;
-  struct local_list *last = NULL;
-
-  for (; p; p = next) {
-    next = p->next;
-    p->next = last;
-    last = p;
-  }
-  return last;
-}
-
 /*
  * Output routines
  */
@@ -501,8 +489,6 @@ void joutput_edit_code_command(const char *target) {
   }
 
   pclose(fp);
-
-  return 0;
 }
 
 /*
@@ -516,7 +502,7 @@ static void joutput_base(struct cb_field *f) {
   struct base_list *bl;
   char *nmp;
   char name[COB_SMALL_BUFF];
-  char *base_name;
+  char *base_name = NULL;
 
   f01 = cb_field_founder(f);
 
@@ -571,7 +557,9 @@ static void joutput_base(struct cb_field *f) {
     joutput("%s%s", CB_PREFIX_BASE, name);
   } else {
     joutput(name);
-    free(base_name);
+    if (base_name != NULL) {
+      free(base_name);
+    }
   }
 
   if (cb_field_variable_address(f)) {
@@ -1328,7 +1316,6 @@ static void joutput_param(cb_tree x, int id) {
     }
     if (!r->subs && !r->offset && f->count > 0 && !cb_field_variable_size(f) &&
         !cb_field_variable_address(f)) {
-      int joutput_flag = 0;
       if (!f->flag_field) {
         savetarget = joutput_target;
         joutput_target = NULL;
@@ -2454,7 +2441,7 @@ static void joutput_call(struct cb_call *p) {
   char *system_call = NULL;
   struct system_table *psyst;
   size_t n;
-  size_t parmnum;
+  size_t parmnum = 0;
   size_t retptr;
   int dynamic_link = 1;
   int sizes;
@@ -4027,17 +4014,14 @@ struct call_parameter_list *call_parameter_cache = NULL;
 static void joutput_java_entrypoint(struct cb_program *prog,
                                     cb_tree parameter_list) {
   cb_tree l;
-  struct cb_field *f;
   char arg_field_name[COB_SMALL_BUFF];
 
   joutput_prefix();
   joutput("public CobolResultSet execute (");
 
-  int k;
   for (l = parameter_list; l; l = CB_CHAIN(l)) {
     struct cb_field *arg_field = cb_field(CB_VALUE(l));
     int type = cb_tree_type(CB_TREE(arg_field));
-    char *field_name = get_java_identifier_field(arg_field);
     get_java_identifier_helper(arg_field, arg_field_name);
     if (type & COB_TYPE_NUMERIC) {
       if (arg_field->pic->scale > 0) {
@@ -5381,16 +5365,6 @@ void joutput_declare_member_variables(struct cb_program *prog,
   joutput("\n");
 }
 
-static void joutput_main_function(struct cb_program *prog) {
-  joutput_line("/* Main function */");
-  joutput_line("int");
-  joutput_line("main (int argc, char **argv)");
-  joutput_indent("{");
-  joutput_line("cob_init (argc, argv);");
-  joutput_line("cob_stop_run (%s ());", prog->program_id);
-  joutput_indent("}\n");
-}
-
 /*
  * Class definition
  */
@@ -5672,7 +5646,7 @@ void codegen(struct cb_program *prog, const int nested,
   joutput_target = yyout;
   char java_file_name[64];
   sprintf(java_file_name, "%s.java", prog->program_id);
-  *program_id_list = prog->program_id;
+  *program_id_list = (char *)prog->program_id;
   joutput_target = fopen(java_file_name, "w");
 
   if (!nested) {

cobj/tree.h

@@ -1472,8 +1472,8 @@ extern void cb_emit_divide(cb_tree dividend, cb_tree divisor, cb_tree quotient,
 extern void cb_emit_evaluate(cb_tree subject_list, cb_tree case_list);
 
 extern void cb_emit_goto(cb_tree target, cb_tree depending);
-extern void cb_emit_java_continue();
-extern void cb_emit_java_break();
+extern void cb_emit_java_continue(void);
+extern void cb_emit_java_break(void);
 extern void cb_emit_exit(size_t goback);
 
 extern void cb_emit_if(cb_tree cond, cb_tree stmt1, cb_tree stmt2);

cobj/typeck.c

@@ -3743,12 +3743,12 @@ void cb_emit_goto(cb_tree target, cb_tree depending) {
   }
 }
 
-void cb_emit_java_continue() {
+void cb_emit_java_continue(void) {
   cb_emit(make_tree(CB_TAG_JAVA_CONTINUE, CB_CATEGORY_UNKNOWN,
                     sizeof(struct cb_tree_common)));
 }
 
-void cb_emit_java_break() {
+void cb_emit_java_break(void) {
 
   cb_emit(make_tree(CB_TAG_JAVA_BREAK, CB_CATEGORY_UNKNOWN,
                     sizeof(struct cb_tree_common)));

configure

@@ -21821,7 +21821,6 @@ printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h
 
 
 
-# AM_LANGINFO_CODESET
 
 # Checks for getopt_long.
 # Cygwin has getopt_long_only prototype in kpathsea/getopt.h
@@ -24777,7 +24776,7 @@ esac
 
 if test "`basename $CC`" = "gcc"
 then
-	CFLAGS="$CFLAGS -fsigned-char -Wall -Wwrite-strings -Wmissing-prototypes -Wno-format-y2k"
+	CFLAGS="$CFLAGS -fsigned-char -Wall -Wwrite-strings -Wmissing-prototypes -Wno-format-y2k -Wno-format-security -Wno-incompatible-pointer-types"
 fi
 
 if test "x$lt_cv_dlopen_self" != "xyes"

configure.ac

@@ -617,7 +617,7 @@ esac
 
 if test "`basename $CC`" = "gcc"
 then
-	CFLAGS="$CFLAGS -fsigned-char -Wall -Wwrite-strings -Wmissing-prototypes -Wno-format-y2k"
+	CFLAGS="$CFLAGS -fsigned-char -Wall -Wwrite-strings -Wmissing-prototypes -Wno-format-y2k -Wno-format-security -Wno-incompatible-pointer-types"
 fi
 
 if test "x$lt_cv_dlopen_self" != "xyes"