A few GCC 3.4.x and MSVC++ warning fixes.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1839 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 90 insertions, 102 deletions

diff --git a/lang/langcomp.c b/lang/langcomp.c
index 773702ba7..f32a1b2e5 100644
--- a/lang/langcomp.c
+++ b/lang/langcomp.c
@@ -71,28 +71,28 @@ int read_index_file()
 	int i;
 
 	if (!(f = fopen("index", "rb"))) {
-	perror("fopen(index)");
-	return -1;
+		perror("fopen(index)");
+		return -1;
 	}
 	while (fgets(buf, sizeof(buf), f))
-	numstrings++;
-	if (!(stringnames = (char **)calloc(sizeof(char *), numstrings))) {
-	perror("calloc(stringnames)");
-	return -1;
+		numstrings++;
+	if (!(stringnames = static_cast<char **>(calloc(sizeof(char *), numstrings)))) {
+		perror("calloc(stringnames)");
+		return -1;
 	}
-	if (!(strings = (char **)calloc(sizeof(char *), numstrings))) {
-	perror("calloc(strings)");
-	return -1;
+	if (!(strings = static_cast<char **>(calloc(sizeof(char *), numstrings)))) {
+		perror("calloc(strings)");
+		return -1;
 	}
 	fseek(f, 0, SEEK_SET);
 	i = 0;
 	while (fgets(buf, sizeof(buf), f)) {
-	if (buf[strlen(buf)-1] == '\n')
-		buf[strlen(buf)-1] = '\0';
-	if (!(stringnames[i++] = anopeStrDup(buf))) {
-		perror("strdup()");
-		return -1;
-	}
+		if (buf[strlen(buf) - 1] == '\n')
+			buf[strlen(buf)  -1] = '\0';
+		if (!(stringnames[i++] = anopeStrDup(buf))) {
+			perror("strdup()");
+			return -1;
+		}
 	}
 	fclose(f);
 	return 0;
@@ -107,8 +107,8 @@ int stringnum(const char *name)
 	int i;
 
 	for (i = 0; i < numstrings; i++) {
-	if (strcmp(stringnames[i], name) == 0)
-		return i;
+		if (strcmp(stringnames[i], name) == 0)
+			return i;
 	}
 	return -1;
 }
@@ -124,13 +124,13 @@ char *ano_getline(FILE *f)
 	char *s;
 
 	do {
-	if (!(fgets(buf, sizeof(buf), f)))
-		return NULL;
-	linenum++;
+		if (!(fgets(buf, sizeof(buf), f)))
+			return NULL;
+		linenum++;
 	} while (*buf == '#' || *buf == '\n');
-	s = buf + strlen(buf)-1;
+	s = buf + strlen(buf) - 1;
 	if (*s == '\n')
-	*s = '\0';
+		*s = '\0';
 	return buf;
 }
 
@@ -140,22 +140,24 @@ char *ano_getline(FILE *f)
 
 int fput32(int val, FILE *f)
 {
-	if (fputc(val>>24, f) < 0 ||
-		fputc(val>>16, f) < 0 ||
-		fputc(val>> 8, f) < 0 ||
-		fputc(val	, f) < 0
+	if (fputc(val >> 24, f) < 0 ||
+		fputc(val >> 16, f) < 0 ||
+		fputc(val >> 8, f) < 0 ||
+		fputc(val, f) < 0
 	) {
-	return -1;
+		return -1;
 	} else {
-	return 0;
+		return 0;
 	}
 }
 
 /*************************************************************************/
-char *anopeStrDup(const char *src) {
+
+char *anopeStrDup(const char *src)
+{
 	char *ret=NULL;
-	if(src) {
-		if( (ret = (char *)malloc(strlen(src)+1)) ) {;
+	if (src) {
+		if ((ret = static_cast<char *>(malloc(strlen(src) + 1)))) {
 			strcpy(ret,src);
 		}
 	}
@@ -163,10 +165,10 @@ char *anopeStrDup(const char *src) {
 }
 
 /*************************************************************************/
+
 int main(int ac, char **av)
 {
-	char *filename = NULL, *s, *outfile;
-	//char langname[254], outfile[256];
+	char *filename = NULL, *outfile;
 	FILE *in, *out;
 	int warn = 0;
 	int retval = 0;
@@ -175,97 +177,83 @@ int main(int ac, char **av)
 	int pos;
 	int maxerr = 50;	/* Max errors before we bail out */
 
-	if (ac >= 3 && strcmp(av[2], "-w") == 0) {
-	warn = 1;
-	av[2] = av[3];
-	ac--;
+	if (ac >= 3 && strcmp(av[1], "-w") == 0) {
+		warn = 1;
+		av[1] = av[2];
+		av[2] = av[3];
+		ac--;
 	}
 	if (ac != 3) {
-	fprintf(stderr, "Usage: %s [-w] <lang-file> <out-file>\n", av[0]);
-	return 1;
+		fprintf(stderr, "Usage: %s [-w] <lang-file> <out-file>\n", av[0]);
+		return 1;
 	}
 	filename = av[1];
-	/*s = strrchr(filename, '.');
-	if (!s)
-	s = filename + strlen(filename);
-	if (s-filename > (int)sizeof(langname)-3)
-	s = filename + sizeof(langname)-1;
-	strncpy(langname, filename, s-filename);
-	langname[s-filename] = '\0';
-	snprintf(outfile, sizeof(outfile), "%s", langname);*/
 	outfile = av[2];
 
 	if (read_index_file() < 0)
-	return 1;
+		return 1;
 	if (!(in = fopen(filename, "rb"))) {
-	perror(filename);
-	return 1;
+		perror(filename);
+		return 1;
 	}
 	if (!(out = fopen(outfile, "wb"))) {
-	perror(outfile);
-	return 1;
+		perror(outfile);
+		return 1;
 	}
 
 	while (maxerr > 0 && (line = ano_getline(in)) != NULL) {
-	if (*line == '\t') {
-		if (curstring == -2) {
-		fprintf(stderr, "%s:%d: Junk at beginning of file\n",
-			filename, linenum);
-		retval = 1;
-		} else if (curstring >= 0) {
-		line++;
-		i = strings[curstring] ? strlen(strings[curstring]) : 0;
-		if (!(strings[curstring] =
-			(char *)realloc(strings[curstring], i+strlen(line)+2))) {
-			fprintf(stderr, "%s:%d: Out of memory!\n",filename,linenum);
-			return 2;
-		}
-		sprintf(strings[curstring]+i, "%s\n", line);
-		}
-	} else {
-
-		if ((curstring = stringnum(line)) < 0) {
-		fprintf(stderr, "%s:%d: Unknown string name `%s'\n",
-			filename, linenum, line);
-		retval = 1;
-		maxerr--;
-		} else if (strings[curstring]) {
-		fprintf(stderr, "%s:%d: Duplicate occurrence of string `%s'\n",
-			filename, linenum, line);
-		retval = 1;
-		maxerr--;
+		if (*line == '\t') {
+			if (curstring == -2) {
+				fprintf(stderr, "%s:%d: Junk at beginning of file\n", filename, linenum);
+				retval = 1;
+			} else if (curstring >= 0) {
+				line++;
+				i = strings[curstring] ? strlen(strings[curstring]) : 0;
+				if (!(strings[curstring] = static_cast<char *>(realloc(strings[curstring], i + strlen(line) + 2)))) {
+					fprintf(stderr, "%s:%d: Out of memory!\n", filename, linenum);
+					return 2;
+				}
+				sprintf(strings[curstring] + i, "%s\n", line);
+			}
 		} else {
-		if (!(strings[curstring] = (char *)malloc(1))) {
-			fprintf(stderr, "%s:%d: Out of memory!\n",filename,linenum);
-			return 2;
+			if ((curstring = stringnum(line)) < 0) {
+				fprintf(stderr, "%s:%d: Unknown string name `%s'\n", filename, linenum, line);
+				retval = 1;
+				maxerr--;
+			} else if (strings[curstring]) {
+				fprintf(stderr, "%s:%d: Duplicate occurrence of string `%s'\n", filename, linenum, line);
+				retval = 1;
+				maxerr--;
+			} else {
+				if (!(strings[curstring] = static_cast<char *>(malloc(1)))) {
+					fprintf(stderr, "%s:%d: Out of memory!\n", filename, linenum);
+					return 2;
+				}
+				*strings[curstring] = '\0';
+			}
+
+			if (maxerr == 0)
+				fprintf(stderr, "%s:%d: Too many errors!\n", filename, linenum);
 		}
-		*strings[curstring] = '\0';
-		}
-
-		if (maxerr == 0)
-		fprintf(stderr, "%s:%d: Too many errors!\n", filename, linenum);
-
-	}
 	}
 
 	fput32(numstrings, out);
 	pos = numstrings * 8 + 4;
 	for (i = 0; i < numstrings; i++) {
-	int len = strings[i] && *strings[i] ? strlen(strings[i])-1 : 0;
-	fput32(pos, out);
-	fput32(len, out);
-	pos += len;
+		int len = strings[i] && *strings[i] ? strlen(strings[i]) - 1 : 0;
+		fput32(pos, out);
+		fput32(len, out);
+		pos += len;
 	}
 	for (i = 0; i < numstrings; i++) {
-	if (strings[i]) {
-		if (*strings[i])
-		strings[i][strlen(strings[i])-1] = '\0';   /* kill last \n */
-		if (*strings[i])
-		fputs(strings[i], out);
-	} else if (warn) {
-		fprintf(stderr, "%s: String `%s' missing\n", filename,
-			stringnames[i]);
-	}
+		if (strings[i]) {
+			if (*strings[i])
+				strings[i][strlen(strings[i])-1] = '\0';   /* kill last \n */
+			if (*strings[i])
+				fputs(strings[i], out);
+		} else if (warn) {
+			fprintf(stderr, "%s: String `%s' missing\n", filename, stringnames[i]);
+		}
 	}
 
 	fclose(in);