projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Ignore!) Removed a trailing whitespace line, just for a test.
[mmh]
/
uip
/
fmtdump.c
diff --git
a/uip/fmtdump.c
b/uip/fmtdump.c
index
d948a06
..
fc94247
100644
(file)
--- a/
uip/fmtdump.c
+++ b/
uip/fmtdump.c
@@
-14,11
+14,9
@@
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 1
- { "format string", 5 },
-#define VERSIONSW 2
- { "version", 0 },
-#define HELPSW 3
+#define VERSIONSW 1
+ { "Version", 0 },
+#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-44,9
+42,8
@@
static void litputc(char);
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- int ncomps;
- char *cp, *form = NULL, *format = NULL;
- char buf[BUFSIZ], *nfs, **argp, **arguments;
+ char *cp, *form = NULL;
+ char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
#ifdef LOCALE
struct format *fmt;
#ifdef LOCALE
@@
-82,13
+79,6
@@
main(int argc, char **argv)
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- form = NULL;
continue;
}
continue;
}
@@
-102,8
+92,8
@@
main(int argc, char **argv)
/*
** Get new format string. Must be before chdir().
*/
/*
** Get new format string. Must be before chdir().
*/
- nfs = new_fs(form, format, FORMAT);
- ncomps = fmt_compile(nfs, &fmt);
+ fmtstr = new_fs(form, FORMAT);
+ fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
done(0);
fmt_dump(fmt);
done(0);