From 8e3cb152bca65da6ecbdcef5c5cbc6b11d0a8e28 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 18 Jun 2015 23:53:50 +0000
Subject: [PATCH] Removendo warnings

---
 configure.ac         |  4 ++++
 po/pt_BR.po          |  2 +-
 pw3270.cbp           | 16 ++++++++++++++++
 src/java/Makefile.in | 10 +++++-----
 src/java/field.cc    |  6 +++---
 src/java/plugin.cc   |  2 +-
 src/lib3270/util.c   | 40 +++++++++++++++++++++++++++++-----------
 7 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce892d3..74190ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,6 +340,7 @@ if test "$app_cv_java" = "yes" ; then
 fi
 
 if test "$app_cv_java" = "yes" ; then
+
 	AC_PATH_TOOL([JAVA], [java], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
 	AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
 	AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH])
@@ -348,6 +349,9 @@ if test "$app_cv_java" = "yes" ; then
 
 	EXTENSIONS="$EXTENSIONS java"
 	PLUGINS="$PLUGINS j3270"
+else
+
+	AC_MSG_NOTICE([jdk is NOT present or disabled.])
 
 fi
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eea3d3a..7c70c4f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-18 14:22-0300\n"
+"POT-Creation-Date: 2015-06-18 19:51-0300\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
diff --git a/pw3270.cbp b/pw3270.cbp
index 84c41ad..d45a25c 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -110,6 +110,10 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
+		<Unit filename="src/java/clipboard.cc">
+			<Option target="Debug" />
+			<Option target="Release" />
+		</Unit>
 		<Unit filename="src/java/connect.cc">
 			<Option target="Debug" />
 			<Option target="Release" />
@@ -118,6 +122,14 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
+		<Unit filename="src/java/dialog.cc">
+			<Option target="Debug" />
+			<Option target="Release" />
+		</Unit>
+		<Unit filename="src/java/field.cc">
+			<Option target="Debug" />
+			<Option target="Release" />
+		</Unit>
 		<Unit filename="src/java/getset.cc">
 			<Option target="Debug" />
 			<Option target="Release" />
@@ -126,6 +138,10 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
+		<Unit filename="src/java/jni3270.h">
+			<Option target="Debug" />
+			<Option target="Release" />
+		</Unit>
 		<Unit filename="src/java/keyboard.cc">
 			<Option target="Debug" />
 			<Option target="Release" />
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index f0bbc1c..dee93c3 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -118,17 +118,17 @@ $(BINDIR)/java/%.class: %.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 $(BINDIR)/java/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 	@echo $< ...
 	@mkdir -p `dirname $@`
-	$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
+	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
 
 $(BINDIR)/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 	@echo $< ...
 	@mkdir -p `dirname $@`
-	$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
+	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
 
 %.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 	@echo $< ...
 	@mkdir -p `dirname $@`
-	$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d `dirname $@` $<
+	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d `dirname $@` $<
 
 $(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
 	@echo $< ...
@@ -175,7 +175,7 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
 
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINRLS)@DLLDIR@ -ljni3270
+	@$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINRLS)@DLLDIR@ -ljni3270
 
 #---[ Debug targets ]----------------------------------------------------------
 
@@ -197,7 +197,7 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
 
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINDBG)@DLLDIR@ -ljni3270
+	@$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINDBG)@DLLDIR@ -ljni3270
 
 run: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
 	@LD_LIBRARY_PATH=../../.bin/Debug@DLLDIR@/ java -Djava.library.path=$(BINDBG)@DLLDIR@ -cp .bin/java/ testprogram
diff --git a/src/java/field.cc b/src/java/field.cc
index 8e32381..2b4415b 100644
--- a/src/java/field.cc
+++ b/src/java/field.cc
@@ -34,7 +34,7 @@
 
 JNIEXPORT jint JNICALL Java_pw3270_terminal_get_1field_1start (JNIEnv *env, jobject obj, jint baddr) {
 
-	jint rc;
+	jint rc = -1;
 
 	try {
 
@@ -53,7 +53,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_get_1field_1start (JNIEnv *env, jobj
 
 JNIEXPORT jint JNICALL Java_pw3270_terminal_get_1field_1len (JNIEnv *env, jobject obj, jint baddr) {
 
-	jint rc;
+	jint rc = -1;
 
 	try {
 
@@ -72,7 +72,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_get_1field_1len (JNIEnv *env, jobjec
 
 JNIEXPORT jint JNICALL Java_pw3270_terminal_get_1next_1unprotected(JNIEnv *env, jobject obj, jint baddr) {
 
-	jint rc;
+	jint rc = -1;
 
 	try {
 
diff --git a/src/java/plugin.cc b/src/java/plugin.cc
index a520932..8fe58f9 100644
--- a/src/java/plugin.cc
+++ b/src/java/plugin.cc
@@ -418,7 +418,7 @@ extern "C" {
 	rc = JNI_CreateJavaVM(&jvm,(void **)&env,&vm_args);
 
 	// Release options
-	for(size_t f=0;f<vm_args.nOptions;f++) {
+	for(int f=0;f<vm_args.nOptions;f++) {
 		trace("Releasing option %d: %s",f,options[f].optionString);
 		g_free(options[f].optionString);
 	}
diff --git a/src/lib3270/util.c b/src/lib3270/util.c
index 3e142c3..f6815fb 100644
--- a/src/lib3270/util.c
+++ b/src/lib3270/util.c
@@ -219,22 +219,40 @@ LIB3270_EXPORT const char * lib3270_win32_local_charset(void)
  */
 char * lib3270_vsprintf(const char *fmt, va_list args)
 {
-	char *r;
-#if defined(HAVE_VASPRINTF) /*[*/
-	(void) vasprintf(&r, fmt, args);
-	if(!r)
+	char *r = NULL;
+
+#if defined(HAVE_VASPRINTF)
+
+	if(vasprintf(&r, fmt, args) < 0 || !r)
 		Error(NULL,"Out of memory in %s",__FUNCTION__);
-	return r;
-#else /*][*/
+
+#else
+
 	char buf[16384];
 	int nc;
 
 	nc = vsnprintf(buf, sizeof(buf), fmt, args);
-	if (nc > sizeof(buf))
-		Error(NULL,"Internal buffer overflow");
-	r = lib3270_malloc(nc + 1);
-	return strcpy(r, buf);
-#endif /*]*/
+	if(nc < 0)
+	{
+		Error(NULL,"Out of memory in %s",__FUNCTION__);
+	}
+	else if (nc < sizeof(buf))
+	{
+		r = lib3270_malloc(nc + 1);
+		strcpy(r, buf);
+
+	}
+	else
+	{
+		r = lib3270_malloc(nc + 1);
+		if(vsnprintf(r, nc, fmt, args) < 0)
+			Error(NULL,"Out of memory in %s",__FUNCTION__);
+
+	}
+
+#endif
+
+	return r;
 }
 
 LIB3270_EXPORT char * lib3270_strdup_printf(const char *fmt, ...)
--
libgit2 0.21.2