From 0acc7bd1a3c373b7fab47ae203b0cdbbad709b62 Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@altlinux.org>
Date: Sun, 20 Jan 2008 16:38:58 +0300
Subject: [PATCH] Fix more build warnings

Signed-off-by: Alexey Gladkov <legion@altlinux.org>
---
 src/Makefile.in |  3 ++-
 src/analyze.l   |  2 +-
 src/loadkeys.y  | 16 ++++++++--------
 src/psffontop.c |  6 +++++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 4e9f890..44af1d4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,7 +33,8 @@ endif
 # Installed by default
 SHCMDS  = unicode_start unicode_stop
 
-WARN	= -Wall -Wmissing-prototypes -Wstrict-prototypes
+WARN	= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wunused-function \
+	-Wunused-label -Wunused-variable -Wunused-value
 DEFS	= -DDATADIR=\"$(DATA_DIR)\"
 
 .c.o:
diff --git a/src/analyze.l b/src/analyze.l
index 287eeae..f55c676 100644
--- a/src/analyze.l
+++ b/src/analyze.l
@@ -117,7 +117,7 @@ To                      to|To|TO
 '\\{Octa}'              {yylval = strtol(yytext+2,NULL,8); return(CCHAR);}
 '\\.'                   {yylval = yytext[2]; return(CCHAR);}
 '.'                     {yylval = yytext[1]; return(CCHAR);}
-\"			{p=kbs_buf.kb_string;
+\"			{p=(char *) kbs_buf.kb_string;
 				pmax=p+sizeof(kbs_buf.kb_string)-1;
 				BEGIN(STR);}
 <STR>\\{Octa}		{if(p>=pmax)stringovfl();*p++=strtol(yytext+1,NULL,8);}
diff --git a/src/loadkeys.y b/src/loadkeys.y
index f1f2d02..310f1fa 100644
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -105,7 +105,7 @@ line		: EOL
 		;
 charsetline	: CHARSET STRLITERAL EOL
 			{
-			    set_charset(kbs_buf.kb_string);
+			    set_charset((char *) kbs_buf.kb_string);
 			}
 		;
 altismetaline	: ALT_IS_META EOL
@@ -120,7 +120,7 @@ usualstringsline: STRINGS AS USUAL EOL
 		;
 usualcomposeline: COMPOSE AS USUAL FOR STRLITERAL EOL
 			{
-			    compose_as_usual(kbs_buf.kb_string);
+			    compose_as_usual((char *) kbs_buf.kb_string);
 			}
 		  | COMPOSE AS USUAL EOL
 			{
@@ -273,7 +273,7 @@ int quiet = 0;
 int nocompose = 0;
 
 int
-main(unsigned int argc, char *argv[]) {
+main(int argc, char *argv[]) {
 	const char *short_opts = "cC:dhmsuqvV";
 	const struct option long_opts[] = {
 		{ "clearcompose", no_argument, NULL, 'c' },
@@ -539,7 +539,7 @@ FILE *find_incl_file(char *s) {
 		char *user_dir[2] = { 0, 0 };
 		while(ev) {
 			char *t = index(ev, ':');
-			char sv;
+			char sv = 0;
 			if (t) {
 				sv = *t;
 				*t = 0;
@@ -758,7 +758,7 @@ addfunc(struct kbsentry kbs) {
 			while(*p++);
 		}
 	func_table[x] = p;
-        sh = strlen(kbs.kb_string) + 1;
+        sh = strlen((char *) kbs.kb_string) + 1;
 	if (fp + sh > func_buf + sizeof(func_buf)) {
 	        fprintf(stderr,
 			_("%s: addfunc: func_buf overflow\n"), progname);
@@ -769,7 +769,7 @@ addfunc(struct kbsentry kbs) {
 	r = fp;
 	while (q > p)
 	        *--r = *--q;
-	strcpy(p, kbs.kb_string);
+	strcpy(p, (char *) kbs.kb_string);
 	for (i = x + 1; i < MAX_NR_FUNC; i++)
 	        if (func_table[i])
 		        func_table[i] += sh;
@@ -928,7 +928,7 @@ deffuncs(int fd){
         for (i = 0; i < MAX_NR_FUNC; i++) {
 	    kbs_buf.kb_func = i;
 	    if ((p = func_table[i])) {
-		strcpy(kbs_buf.kb_string, p);
+		strcpy((char *) kbs_buf.kb_string, p);
 		if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs_buf))
 		  fprintf(stderr, _("failed to bind string '%s' to function %s\n"),
 			  ostr(kbs_buf.kb_string), syms[KT_FN].table[kbs_buf.kb_func]);
@@ -1066,7 +1066,7 @@ static void strings_as_usual(void) {
 	for (i=0; i<30; i++) if(stringvalues[i]) {
 		struct kbsentry ke;
 		ke.kb_func = i;
-		strncpy(ke.kb_string, stringvalues[i], sizeof(ke.kb_string));
+		strncpy((char *) ke.kb_string, stringvalues[i], sizeof(ke.kb_string));
 		ke.kb_string[sizeof(ke.kb_string)-1] = 0;
 		addfunc(ke);
 	}
diff --git a/src/psffontop.c b/src/psffontop.c
index 5702050..461ab96 100644
--- a/src/psffontop.c
+++ b/src/psffontop.c
@@ -463,7 +463,11 @@ writepsffont(FILE *ofil, char *fontbuf, int width, int height, int fontlen,
 	writepsffontheader(ofil, width, height, fontlen, &psftype, flags);
 	utf8 = (psftype == 2);
 
-	(void)fwrite(fontbuf, charsize, fontlen, ofil);
+	if ((fwrite(fontbuf, charsize, fontlen, ofil)) != fontlen) {
+		fprintf(stderr, _("Cannot write font file"));
+		exit(EX_IOERR);
+	}
+
 	/* unimaps: -1 => do nothing: caller will append map */
 	if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) {
 		struct unicode_list *ul;
-- 
2.7.4