d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Although the file has "ex:ts=4", do some " " -> \t translations

Browse Source 
so that it is also nicely readable with ts=8.
This commit is contained in:
Edwin Groothuis 2009-11-12 21:51:01 +00:00
parent f9d551f7df
commit c2eeded255
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
usr.bin/gencat/gencat.c
View File

@ -94,13 +94,13 @@ __FBSDID("$FreeBSD$");
struct _msgT {
long msgId;
char *str;
LIST_ENTRY(_msgT) entries;
LIST_ENTRY(_msgT) entries;
};
struct _setT {
long setId;
LIST_HEAD(msghead, _msgT) msghead;
LIST_ENTRY(_setT) entries;
LIST_HEAD(msghead, _msgT) msghead;
LIST_ENTRY(_setT) entries;
};
LIST_HEAD(sethead, _setT) sethead;
@ -133,14 +133,14 @@ void
usage()
{
fprintf(stderr, "usage: %s catfile msgfile ...\n", getprogname());
exit(1);
exit(1);
}
int
main(int argc, char **argv)
{
int ofd, ifd;
char *catfile = NULL;
char *catfile = NULL;
int c;
#define DEPRECATEDMSG 1
@ -419,23 +419,23 @@ MCParse(int fd)
cptr += 5;
if (!*cptr)
quote = 0;
else {
else {
cptr = wskip(cptr);
if (!*cptr)
quote = 0;
else
quote = *cptr;
}
}
} else if (isspace((unsigned char) *cptr)) {
;
} else {
} else {
if (*cptr) {
cptr = wskip(cptr);
if (*cptr)
warning(cptr, "unrecognized line");
}
}
} else {
}
} else {
/*
* First check for (and eat) empty lines....
*/
@ -453,7 +453,7 @@ MCParse(int fd)
} else {
warning(cptr, "neither blank line nor start of a message id");
continue;
}
}
/*
* If we have a message ID, but no message,
* then this means "delete this message id
@ -461,12 +461,12 @@ MCParse(int fd)
*/
if (!*cptr) {
MCDelMsg(msgid);
} else {
} else {
str = getmsg(fd, cptr, quote);
MCAddMsg(msgid, str);
}
}
}
}
}
}
void
@ -686,7 +686,7 @@ MCAddSet(int setId)
if (p && p->setId == setId) {
;
} else {
} else {
p = xmalloc(sizeof(struct _setT));
memset(p, '\0', sizeof(struct _setT));
LIST_INIT(&p->msghead);
@ -697,8 +697,8 @@ MCAddSet(int setId)
LIST_INSERT_HEAD(&sethead, p, entries);
} else {
LIST_INSERT_AFTER(q, p, entries);
}
}
}
}
curSet = p;
}
@ -718,7 +718,7 @@ MCAddMsg(int msgId, const char *str)
if (msgId > NL_MSGMAX) {
error("msgID exceeds limit");
/* NOTREACHED */
}
}
p = curSet->msghead.lh_first;
q = NULL;
@ -739,7 +739,7 @@ MCAddMsg(int msgId, const char *str)
p->msgId = msgId;
p->str = xstrdup(str);
}
}
void
MCDelSet(int setId)
@ -756,13 +756,13 @@ MCDelSet(int setId)
while (msg) {
free(msg->str);
LIST_REMOVE(msg, entries);
}
}
LIST_REMOVE(set, entries);
return;
}
warning(NULL, "specified set doesn't exist");
}
warning(NULL, "specified set doesn't exist");
}
void
MCDelMsg(int msgId)
@ -779,6 +779,6 @@ MCDelMsg(int msgId)
free(msg->str);
LIST_REMOVE(msg, entries);
return;
}
}
warning(NULL, "specified msg doesn't exist");
}