[patch] app-pda/pilot-link-0.11.8/work/pilot-link-0.11.8/libpisock/util.c

iso8859-2.patch (text/plain), 1.75 KB, created by Michael Dominic K. on 2004-10-16 13:13:52 UTC

--- pilot-link-0.11.8/work/pilot-link-0.11.8/libpisock/util.c	2002-07-30 17:52:24.000000000 +0200
+++ pilot-link-0.11.8.patched/work/pilot-link-0.11.8/libpisock/util.c	2004-10-16 21:46:33.000000000 +0200
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+   THIS FILE WAS PATCHED WITH ISO8859-2 PATCH FOR EVOLUTION CONDUITS */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -26,13 +26,14 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "pi-util.h"
 
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
 
-#define PILOT_CHARSET "CP1252"
+#define PILOT_CHARSET "ISO8859-2"
 
 /***********************************************************************
  *
@@ -51,11 +52,13 @@
 		    int bytes, char **ptext)
 {
 #ifdef HAVE_ICONV
-	char 	*ib,
+
+        char 	*ib,
 		*ob;
 	iconv_t cd;
 	size_t 	ibl, obl;
-
+	
+	
 	cd = iconv_open(PILOT_CHARSET, charset);
 	if (!cd)
 		return -1;
@@ -65,13 +68,13 @@
 	ib 	= (char *)text;
 	*ptext 	= ob = malloc(obl);
 	
-	if (iconv(cd, &ib, &ibl, &ob, &obl) == -1)
-		return -1;
+	iconv(cd, &ib, &ibl, &ob, &obl);
 	*ob = '\0';
 
 	iconv_close(cd);
 
 	return 0;
+	
 #else
 	return -1;
 #endif
@@ -94,11 +97,12 @@
 		      int bytes, char **text)
 {
 #ifdef HAVE_ICONV
+
 	char 	*ib,
 		*ob;
 	iconv_t cd;
 	size_t 	ibl, obl;
-
+			
 	cd = iconv_open(charset, PILOT_CHARSET);
 	if (!cd)
 		return -1;
@@ -108,13 +112,13 @@
 	ib 	= (char *)ptext;
 	*text 	= ob = malloc(obl);
 	
-	if (iconv(cd, &ib, &ibl, &ob, &obl) == -1)
-		return -1;
+	iconv(cd, &ib, &ibl, &ob, &obl);
 	*ob = '\0';
 
 	iconv_close(cd);
 
 	return 0;
+	
 #else
 	return -1;
 #endif