projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop register storage class
[mmh]
/
uip
/
fmtdump.c
diff --git
a/uip/fmtdump.c
b/uip/fmtdump.c
index
fc94247
..
5266235
100644
(file)
--- a/
uip/fmtdump.c
+++ b/
uip/fmtdump.c
@@
-10,6
+10,8
@@
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
#include <h/scansbr.h>
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
#include <h/scansbr.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define FORMSW 0
static struct swit switches[] = {
#define FORMSW 0
@@
-46,9
+48,7
@@
main(int argc, char **argv)
char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-62,29
+62,29
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [switches]",
invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [switches]",
invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case FORMSW:
if (!(form = *argp++) || *form == '-')
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
}
}
if (form)
argp[-2]);
continue;
}
}
if (form)
- adios(NULL, "only one form at a time!");
+ adios(EX_USAGE, NULL, "only one form at a time!");
else
form = cp;
}
else
form = cp;
}
@@
-96,15
+96,14
@@
main(int argc, char **argv)
fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
- done(0);
- return 1;
+ return EX_OK;
}
static void
fmt_dump(struct format *fmth)
{
int i;
}
static void
fmt_dump(struct format *fmth)
{
int i;
- register struct format *fmt, *addr;
+ struct format *fmt, *addr;
/* Assign labels */
for (fmt = fmth; fmt; ++fmt) {
/* Assign labels */
for (fmt = fmth; fmt; ++fmt) {
@@
-132,7
+131,7
@@
fmt_dump(struct format *fmth)
static void
dumpone(struct format *fmt)
{
static void
dumpone(struct format *fmt)
{
- register int i;
+ int i;
if ((i = findlabel(fmt)) >= 0)
printf("L%d:", i);
if ((i = findlabel(fmt)) >= 0)
printf("L%d:", i);
@@
-313,7
+312,7
@@
dumpone(struct format *fmt)
static int
findlabel(struct format *addr)
{
static int
findlabel(struct format *addr)
{
- register int i;
+ int i;
for (i = 0; i < lused; ++i)
if (addr == lvec[i])
for (i = 0; i < lused; ++i)
if (addr == lvec[i])
@@
-437,7
+436,7
@@
f_typestr(int t)
static char *
c_typestr(int t)
{
static char *
c_typestr(int t)
{
- register int i;
+ int i;
static char buf[64];
buf[0] = '\0';
static char buf[64];
buf[0] = '\0';
@@
-454,7
+453,7
@@
c_typestr(int t)
static char *
c_flagsstr(int t)
{
static char *
c_flagsstr(int t)
{
- register int i;
+ int i;
static char buf[64];
buf[0] = '\0';
static char buf[64];
buf[0] = '\0';