Merge branch 'release/v1.5.1J'

n-isaka · n-isaka · commit f42621433437 · 2016-12-09T10:26:56.000+09:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,8 @@
-2015-05-11  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
+2016-12-09  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
+
+	* opensource COBOL Version 1.5.1J released.
+
+2016-05-11  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
 
 	* opensource COBOL Version 1.5.0J released.
 
diff --git a/NEWS b/NEWS
@@ -1,5 +1,21 @@
 NEWS - user visible changes				-*- outline -*-
 
+* Changes in opensource COBOL 1.5.1J
+
+** Bug fixes
+
+*** build error on Windows.
+
+*** test failure caused by missing inline-function declarations on gcc5.
+
+*** compiler warnings on v1.3 or later.
+
+** Changes
+
+*** update solution file in Visual Studio to 2015.
+
+-----------------------------------------------------------------------
+
 * Changes in opensource COBOL 1.5.0J
 
 ** New features
diff --git a/cobc/cobc.c b/cobc/cobc.c
@@ -817,7 +817,7 @@ cobc_sig_handler (int sig)
 static void
 cobc_print_version (void)
 {
-	puts ("opensource COBOL 1.5J");
+	puts ("opensource COBOL 1.5.1J");
 	puts ("OSS Consortium's patched version of OpenCOBOL1.1(Feb.06 2009)");
 #ifdef	I18N_UTF8
 	puts ("[unicode/utf-8 support]");
diff --git a/cobc/codegen.c b/cobc/codegen.c
@@ -998,6 +998,7 @@ output_param (cb_tree x, int id)
 	int			extrefs;
 	int			sav_stack_id;
 	char			fname[12];
+	COB_UNUSED(extrefs);
 
 	param_id = id;
 
diff --git a/cobc/pplex.c b/cobc/pplex.c
@@ -3797,6 +3797,7 @@ check_dollar_directive (char *buff, int *line_size)
 	char			sbuff[5][256];
 	int			isDEFINED, isNOT;
 	int			i;
+	COB_UNUSED(n);
 
 	if (cb_source_format == CB_FORMAT_FIXED) {
 		if (*line_size < 8) {
diff --git a/cobc/pplex.l b/cobc/pplex.l
@@ -743,6 +743,7 @@ check_dollar_directive (char *buff, int *line_size)
 	char			sbuff[5][256];
 	int			isDEFINED, isNOT;
 	int			i;
+	COB_UNUSED(n);
 
 	if (cb_source_format == CB_FORMAT_FIXED) {
 		if (*line_size < 8) {
diff --git a/cobc/pplex.l.m4 b/cobc/pplex.l.m4
@@ -758,6 +758,7 @@ check_dollar_directive (char *buff, int *line_size)
 	char			sbuff[5][256];
 	int			isDEFINED, isNOT;
 	int			i;
+	COB_UNUSED(n);
 
 	if (cb_source_format == CB_FORMAT_FIXED) {
 		if (*line_size < 8) {
diff --git a/cobc/tree.c b/cobc/tree.c
@@ -1275,6 +1275,7 @@ cb_build_picture (const char *str)
 	unsigned char		lastonechar = 0;
 	unsigned char		lasttwochar = 0;
 	unsigned char		buff[COB_SMALL_BUFF];
+	COB_UNUSED(flg);
 
 	pic = make_tree (CB_TAG_PICTURE, CB_CATEGORY_UNKNOWN, sizeof (struct cb_picture));
 	if (strlen (str) > 50) {
diff --git a/cobc/typeck.c b/cobc/typeck.c
@@ -832,6 +832,7 @@ cb_reference_type_check (cb_tree ref, cb_tree x, const char *name, int size, int
 	char			strbuf[256];
 	int			offset = 0 ;
 	int			ret = 0;
+	COB_UNUSED(r);
 
 	r = CB_REFERENCE (ref);
 	switch (CB_TREE_TAG (x)) {
diff --git a/configure b/configure
@@ -421,11 +421,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='OpenCOBOL'
-PACKAGE_TARNAME='opensource-cobol-1.5.0J'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='OpenCOBOL 1.1'
-PACKAGE_BUGREPORT='open-cobol-list@lists.sourceforge.net'
+PACKAGE_NAME='opensource COBOL'
+PACKAGE_TARNAME='opensource-cobol-1.5.1J'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='opensource COBOL 1.5.1J'
+PACKAGE_BUGREPORT='ws-opensource-cobol-contact@osscons.jp'
 
 ac_unique_file="libcob.h"
 # Factoring default headers for most tests.
@@ -1858,8 +1858,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='opensource-cobol-1.5.0J'
- VERSION='1.1'
+ PACKAGE='opensource-cobol-1.5.1J'
+ VERSION='1.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
@@ -23,7 +23,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([OpenCOBOL],[1.1],[open-cobol-list@lists.sourceforge.net],[opensource-cobol-1.5.0J])
+AC_INIT([opensource COBOL],[1.5.1],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-1.5.1J])
 AC_CONFIG_SRCDIR([libcob.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
diff --git a/libcob.h b/libcob.h
@@ -37,6 +37,7 @@ extern "C" {
 #include <libcob/strings.h>
 #include <libcob/termio.h>
 #include <libcob/intrinsic.h>
+#include <libcob/codegen.h>
 
 #ifdef __cplusplus
 }
diff --git a/libcob/call.c b/libcob/call.c
@@ -56,10 +56,6 @@
 #include <windows.h>
 /* Prototype */
 static char *	lt_dlerror (void);
-void			init_call_stack_list (void);
-struct call_stack_list
-			cob_create_call_stack_list (const char *);
-void			cob_cancel_call_stack_list (struct call_stack_list *);
 
 static HMODULE
 lt_dlopen (const char *x)
@@ -285,6 +281,48 @@ lookup (const char *name)
 	return NULL;
 }
 
+static void
+init_call_stack_list (void)
+{
+	if (!call_stack_list_head) {
+		call_stack_list_head = cob_malloc (sizeof (struct call_stack_list));
+		memset (call_stack_list_head, 0, sizeof (struct call_stack_list));
+	}
+	current_call_stack_list = call_stack_list_head;
+}
+
+static struct call_stack_list *
+cob_create_call_stack_list (char *name)
+{
+	struct call_stack_list *new_list = cob_malloc (sizeof (struct call_stack_list));
+	memset (new_list, 0, sizeof (struct call_stack_list));
+	new_list->parent = current_call_stack_list;
+	new_list->name = cob_malloc (strlen (name) + 1);
+	strcpy (new_list->name, name);
+	current_call_stack_list = new_list;
+	return new_list;
+}
+
+static void
+cob_cancel_call_stack_list (struct call_stack_list *p)
+{
+	if (!p) {
+		/*No program*/
+		return;
+	}
+	static cob_field_attr a_2 = {33, 0, 0, 0, NULL};
+	cob_field f = {strlen (p->name), (unsigned char *) p->name, &a_2};
+	cob_field_cancel (&f);
+	if (p->children) {
+		cob_cancel_call_stack_list (p->children);
+	}
+	struct call_stack_list *s = p->sister;
+	while (s != NULL) {
+		cob_cancel_call_stack_list (s);
+		s = s->sister;
+	}
+}
+
 const char *
 cob_resolve_error (void)
 {
@@ -676,6 +714,7 @@ void *
 cobsavenv2 (struct cobjmp_buf *jbuf, const int jsize)
 {
 	int	jtemp;
+	COB_UNUSED(jtemp);
 
 	/* Shut up compiler */
 	jtemp = jsize;
@@ -697,28 +736,6 @@ coblongjmp (struct cobjmp_buf *jbuf)
 	longjmp (jbuf->cbj_jmp_buf, 1);
 }
 
-void
-init_call_stack_list ()
-{
-	if (!call_stack_list_head) {
-		call_stack_list_head = cob_malloc (sizeof (struct call_stack_list));
-		memset (call_stack_list_head, 0, sizeof (struct call_stack_list));
-	}
-	current_call_stack_list = call_stack_list_head;
-}
-
-struct call_stack_list *
-cob_create_call_stack_list (char *name)
-{
-	struct call_stack_list *new_list = cob_malloc (sizeof (struct call_stack_list));
-	memset (new_list, 0, sizeof (struct call_stack_list));
-	new_list->parent = current_call_stack_list;
-	new_list->name = cob_malloc (strlen (name) + 1);
-	strcpy (new_list->name, name);
-	current_call_stack_list = new_list;
-	return new_list;
-}
-
 void
 cob_push_call_stack_list (char *name)
 {
@@ -761,26 +778,6 @@ cob_pop_call_stack_list ()
 	current_call_stack_list = current_call_stack_list->parent;
 }
 
-void
-cob_cancel_call_stack_list (struct call_stack_list *p)
-{
-	if (!p) {
-		/*No program*/
-		return;
-	}
-	static cob_field_attr a_2 = {33, 0, 0, 0, NULL};
-	cob_field f = {strlen (p->name), (unsigned char *) p->name, &a_2};
-	cob_field_cancel (&f);
-	if (p->children) {
-		cob_cancel_call_stack_list (p->children);
-	}
-	struct call_stack_list *s = p->sister;
-	while (s != NULL) {
-		cob_cancel_call_stack_list (s);
-		s = s->sister;
-	}
-}
-
 void
 cob_cancel_all ()
 {
diff --git a/libcob/call.h b/libcob/call.h
@@ -36,7 +36,7 @@ struct call_stack_list {
 	struct call_stack_list	*parent;
 	struct call_stack_list	*children;
 	struct call_stack_list	*sister;
-	const char		*name;
+	char			*name;
 };
 
 DECLNORET COB_EXPIMP void	cob_call_error		(void) COB_A_NORETURN;
diff --git a/libcob/common.c b/libcob/common.c
@@ -2095,6 +2095,9 @@ cobcommandline (int flags, int *pargc, char ***pargv, char ***penvp, char **pnam
 	char		**spenvp;
 	char		*spname;
 	int		sflags;
+	COB_UNUSED(spenvp);
+	COB_UNUSED(spname);
+	COB_UNUSED(sflags);
 
 	if (!cob_initialized) {
 		cob_runtime_error ("'cobcommandline' - Runtime has not been initialized");
@@ -2685,7 +2688,7 @@ cob_acuw_calledby (unsigned char *data)
 			memset (f1->data, ' ', (int)f1->size);
 			return 0;
 		} else {
-			called_program_name = (const char *)cob_current_module->next->program_id;
+			called_program_name = (char *)cob_current_module->next->program_id;
 			if (called_program_name == NULL) {
 				return -1;
 			}
diff --git a/libcob/fileio.c b/libcob/fileio.c
@@ -215,6 +215,7 @@ struct dirent		*listdir_filedata;
 #define        READOPTSSIZE  4
 #define        STARTCONDSIZE 2
 #define        EXCPTCODESIZE 6
+#define        FNSTATUSSIZE  3
 
 cob_file		*cob_error_file;
 
@@ -4120,7 +4121,7 @@ cob_invoke_fun (int operate, char *f, cob_field *key, char *rec,
 	char	oper[OPENMODESIZE];
 	char	excpcode[EXCPTCODESIZE];
 	char	*p_excpcode = excpcode;
-	char	tmpfnstatus[2];
+	char	tmpfnstatus[FNSTATUSSIZE];
 	char	*p_tmpfnstatus = tmpfnstatus;
 	int		status1 = 0;
 	int	(*funcint)();
@@ -5481,7 +5482,7 @@ cob_acuw_file_delete (unsigned char *file_name, unsigned char *file_type)
 	return ret;
 }
 
-int
+static int
 cob_listdir_open (cob_field *f_dirname, cob_field *f_pattern)
 {
 	//FIXME: now not use file pattern(ex. *).
@@ -5515,10 +5516,11 @@ cob_listdir_open (cob_field *f_dirname, cob_field *f_pattern)
 	}
 	
 #endif
-	return listdir_handle;
+	//FIXME: now not use handle.
+	return 0;
 }
 
-int
+static int
 cob_listdir_next (cob_field *f_handle, cob_field *f_filename)
 {
 	//FIXME: now not use handle.
@@ -5530,18 +5532,20 @@ cob_listdir_next (cob_field *f_handle, cob_field *f_filename)
 #else
 	listdir_filedata = readdir (listdir_handle);
 	if (listdir_filedata == NULL) {
-		filename = " ";
+		filename = NULL;
 	}else{
 		filename = listdir_filedata->d_name;
 	}
 #endif
-	length = strlen (filename);
+	memset (f_filename->data, ' ', f_filename->size);
 
-	if (length > f_filename->size) {
-		length = f_filename->size;
+	if(filename != NULL){
+		length = strlen (filename);
+		if (length > f_filename->size) {
+			length = f_filename->size;
+		}
+		memcpy (f_filename->data, filename, length);
 	}
-	memset (f_filename->data, ' ', f_filename->size);
-	memcpy (f_filename->data, filename, length);
 #ifdef _WIN32
 	if (!FindNextFile (listdir_handle, listdir_filedata)) {
 		strcpy (listdir_filedata->cFileName, " ");
@@ -5550,7 +5554,7 @@ cob_listdir_next (cob_field *f_handle, cob_field *f_filename)
 	return 0;
 }
 
-int
+static int
 cob_listdir_close (cob_field *f_handle)
 {
 	//FIXME: now not use handle.
diff --git a/libcob/move.c b/libcob/move.c
@@ -554,6 +554,7 @@ cob_move_fp_to_display (cob_field *f1, cob_field *f2)
 	char		*x, *y;
 	char		buff[64];
 	char		buff2[64];
+	COB_UNUSED(frac);
 
 	memset ((ucharptr)buff, 0, sizeof (buff));
 	memset ((ucharptr)buff2, 0, sizeof (buff2));
diff --git a/libcob/numeric.c b/libcob/numeric.c
@@ -30,12 +30,10 @@
 /* Force symbol exports */
 #define	COB_LIB_EXPIMP
 
+#define	COB_LIB_INCLUDE
 #include "libcob.h"
 #include "coblocal.h"
 
-#define	COB_LIB_INCLUDE
-#include "codegen.h"
-
 #define DECIMAL_NAN	-128
 #define DECIMAL_CHECK(d1,d2) \
   if (unlikely(d1->scale == DECIMAL_NAN || d2->scale == DECIMAL_NAN)) { \
diff --git a/libcob/screenio.c b/libcob/screenio.c
@@ -1611,6 +1611,8 @@ CBL_OC_KEISEN (unsigned char * cmd, unsigned char * line, unsigned char * col, u
 	int	k_lng2;
 	int	k_color;
 	int	k_prn;
+	COB_UNUSED(k_color);
+	COB_UNUSED(k_prn);
 
 	COB_CHK_PARMS (CBL_OC_ATTRIBUTE, 5);
 
diff --git a/libcob/strings.c b/libcob/strings.c
diff --git a/po/ja.po b/po/ja.po
diff --git a/tests/package.m4 b/tests/package.m4
diff --git a/win32/cobc/cobc.vcxproj b/win32/cobc/cobc.vcxproj
diff --git a/win32/cobcrun/cobcrun.vcxproj b/win32/cobcrun/cobcrun.vcxproj
diff --git a/win32/config.h b/win32/config.h
diff --git a/win32/libcob/libcob.vcxproj b/win32/libcob/libcob.vcxproj
diff --git a/win32/vbisam/vbisam.vcxproj b/win32/vbisam/vbisam.vcxproj

Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ cobc_sig_handler (int sig)`
`817`	`817`	`static void`
`818`	`818`	`cobc_print_version (void)`
`819`	`819`	`{`
`820`		`- puts ("opensource COBOL 1.5J");`
	`820`	`+ puts ("opensource COBOL 1.5.1J");`
`821`	`821`	`puts ("OSS Consortium's patched version of OpenCOBOL1.1(Feb.06 2009)");`
`822`	`822`	`#ifdef I18N_UTF8`
`823`	`823`	`puts ("[unicode/utf-8 support]");`