diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-14 20:57:20 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-14 20:57:20 +0000 |
| commit | 6c55e0a529c7f1216ff6f63a4fc77ea06a2a3a38 (patch) | |
| tree | 91b0841faf23087ebe0c74dd4269d181a383f1e7 /lang | |
| parent | 069409cd99cf78ab8bf87a1fe69a833576414fd3 (diff) | |
Insane commit of doom: s/ \t/g
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1681 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/langcomp.c | 196 | ||||
| -rw-r--r-- | lang/langtool.c | 4 |
2 files changed, 100 insertions, 100 deletions
diff --git a/lang/langcomp.c b/lang/langcomp.c index e9495462f..5c5988394 100644 --- a/lang/langcomp.c +++ b/lang/langcomp.c @@ -66,36 +66,36 @@ char *anopeStrDup(const char *src); int read_index_file() { - FILE *f; - char buf[256]; - int i; + FILE *f; + char buf[256]; + int i; - if (!(f = fopen("index", "rb"))) { + if (!(f = fopen("index", "rb"))) { perror("fopen(index)"); return -1; - } - while (fgets(buf, sizeof(buf), f)) + } + while (fgets(buf, sizeof(buf), f)) numstrings++; - if (!(stringnames = (char **)calloc(sizeof(char *), numstrings))) { + if (!(stringnames = (char **)calloc(sizeof(char *), numstrings))) { perror("calloc(stringnames)"); return -1; - } - if (!(strings = (char **)calloc(sizeof(char *), numstrings))) { + } + if (!(strings = (char **)calloc(sizeof(char *), numstrings))) { perror("calloc(strings)"); return -1; - } - fseek(f, 0, SEEK_SET); - i = 0; - while (fgets(buf, sizeof(buf), f)) { + } + fseek(f, 0, SEEK_SET); + i = 0; + while (fgets(buf, sizeof(buf), f)) { if (buf[strlen(buf)-1] == '\n') - buf[strlen(buf)-1] = '\0'; + buf[strlen(buf)-1] = '\0'; if (!(stringnames[i++] = anopeStrDup(buf))) { - perror("strdup()"); - return -1; + perror("strdup()"); + return -1; } - } - fclose(f); - return 0; + } + fclose(f); + return 0; } /*************************************************************************/ @@ -104,13 +104,13 @@ int read_index_file() int stringnum(const char *name) { - int i; + int i; - for (i = 0; i < numstrings; i++) { + for (i = 0; i < numstrings; i++) { if (strcmp(stringnames[i], name) == 0) - return i; - } - return -1; + return i; + } + return -1; } /*************************************************************************/ @@ -120,18 +120,18 @@ int stringnum(const char *name) char *ano_getline(FILE *f) { - static char buf[1024]; - char *s; + static char buf[1024]; + char *s; - do { + do { if (!(fgets(buf, sizeof(buf), f))) - return NULL; + return NULL; linenum++; - } while (*buf == '#' || *buf == '\n'); - s = buf + strlen(buf)-1; - if (*s == '\n') + } while (*buf == '#' || *buf == '\n'); + s = buf + strlen(buf)-1; + if (*s == '\n') *s = '\0'; - return buf; + return buf; } /*************************************************************************/ @@ -140,136 +140,136 @@ 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; - } else { + } else { return 0; - } + } } /*************************************************************************/ char *anopeStrDup(const char *src) { - char *ret=NULL; - if(src) { - if( (ret = (char *)malloc(strlen(src)+1)) ) {; - strcpy(ret,src); - } - } - return ret; + char *ret=NULL; + if(src) { + if( (ret = (char *)malloc(strlen(src)+1)) ) {; + strcpy(ret,src); + } + } + return ret; } /*************************************************************************/ int main(int ac, char **av) { - char *filename = NULL, *s; - char langname[254], outfile[256]; - FILE *in, *out; - int warn = 0; - int retval = 0; - int curstring = -2, i; - char *line; - int pos; - int maxerr = 50; /* Max errors before we bail out */ + char *filename = NULL, *s; + char langname[254], outfile[256]; + FILE *in, *out; + int warn = 0; + int retval = 0; + int curstring = -2, i; + char *line; + int pos; + int maxerr = 50; /* Max errors before we bail out */ - if (ac >= 2 && strcmp(av[1], "-w") == 0) { + if (ac >= 2 && strcmp(av[1], "-w") == 0) { warn = 1; av[1] = av[2]; ac--; - } - if (ac != 2) { + } + if (ac != 2) { fprintf(stderr, "Usage: %s [-w] <lang-file>\n", av[0]); return 1; - } - filename = av[1]; - s = strrchr(filename, '.'); - if (!s) + } + filename = av[1]; + s = strrchr(filename, '.'); + if (!s) s = filename + strlen(filename); - if (s-filename > (int)sizeof(langname)-3) + 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); + strncpy(langname, filename, s-filename); + langname[s-filename] = '\0'; + snprintf(outfile, sizeof(outfile), "%s", langname); - if (read_index_file() < 0) + if (read_index_file() < 0) return 1; - if (!(in = fopen(filename, "rb"))) { + if (!(in = fopen(filename, "rb"))) { perror(filename); return 1; - } - if (!(out = fopen(outfile, "wb"))) { + } + if (!(out = fopen(outfile, "wb"))) { perror(outfile); return 1; - } + } - while (maxerr > 0 && (line = ano_getline(in)) != NULL) { + while (maxerr > 0 && (line = ano_getline(in)) != NULL) { if (*line == '\t') { - if (curstring == -2) { + if (curstring == -2) { fprintf(stderr, "%s:%d: Junk at beginning of file\n", filename, linenum); retval = 1; - } else if (curstring >= 0) { + } 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; + 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) { + if ((curstring = stringnum(line)) < 0) { fprintf(stderr, "%s:%d: Unknown string name `%s'\n", filename, linenum, line); retval = 1; maxerr--; - } else if (strings[curstring]) { + } else if (strings[curstring]) { fprintf(stderr, "%s:%d: Duplicate occurrence of string `%s'\n", filename, linenum, line); retval = 1; maxerr--; - } else { + } else { if (!(strings[curstring] = (char *)malloc(1))) { - fprintf(stderr, "%s:%d: Out of memory!\n",filename,linenum); - return 2; + fprintf(stderr, "%s:%d: Out of memory!\n",filename,linenum); + return 2; } *strings[curstring] = '\0'; - } + } - if (maxerr == 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++) { + 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; - } - for (i = 0; i < numstrings; i++) { + } + for (i = 0; i < numstrings; i++) { if (strings[i]) { - if (*strings[i]) + if (*strings[i]) strings[i][strlen(strings[i])-1] = '\0'; /* kill last \n */ - if (*strings[i]) + if (*strings[i]) fputs(strings[i], out); } else if (warn) { - fprintf(stderr, "%s: String `%s' missing\n", filename, + fprintf(stderr, "%s: String `%s' missing\n", filename, stringnames[i]); } - } + } - fclose(in); - fclose(out); - return retval; + fclose(in); + fclose(out); + return retval; } /*************************************************************************/ diff --git a/lang/langtool.c b/lang/langtool.c index 32d9639f7..21890c054 100644 --- a/lang/langtool.c +++ b/lang/langtool.c @@ -62,9 +62,9 @@ int main(int argc, char *argv[]) fprintf(stderr, "Generating language.h... ");
- while (fgets(buf, 1023, fd)) {
+ while (fgets(buf, 1023, fd)) {
fprintf(fdout, "#define %-32s %d\n", strip(buf), i++);
- }
+ }
fprintf(fdout, "#define NUM_STRINGS %d\n", i);
fprintf(stderr, "%d strings\n", i);
|
