projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sbr/brkstring.c: replaced static brkany() with call to strchr(); plus cleanups
[mmh]
/
sbr
/
fmt_new.c
diff --git
a/sbr/fmt_new.c
b/sbr/fmt_new.c
index
7576ae4
..
c7c519f
100644
(file)
--- a/
sbr/fmt_new.c
+++ b/
sbr/fmt_new.c
@@
-16,7
+16,7
@@
static char *formats = 0;
/*
** static prototypes
*/
/*
** static prototypes
*/
-static void normalize (char *);
+static void normalize(char *);
/*
/*
@@
-24,34
+24,34
@@
static void normalize (char *);
*/
char *
*/
char *
-new_fs (char *form, char *format, char *default_fs)
+new_fs(char *form, char *format, char *default_fs)
{
struct stat st;
register FILE *fp;
if (formats)
{
struct stat st;
register FILE *fp;
if (formats)
- free (formats);
+ free(formats);
if (form) {
if (form) {
- if ((fp = fopen (etcpath (form), "r")) == NULL)
- adios (form, "unable to open format file");
+ if ((fp = fopen(etcpath(form), "r")) == NULL)
+ adios(form, "unable to open format file");
- if (fstat (fileno (fp), &st) == -1)
- adios (form, "unable to stat format file");
+ if (fstat(fileno(fp), &st) == -1)
+ adios(form, "unable to stat format file");
- formats = mh_xmalloc ((size_t) st.st_size + 1);
+ formats = mh_xmalloc((size_t) st.st_size + 1);
- if (read (fileno(fp), formats, (int) st.st_size) != st.st_size)
- adios (form, "error reading format file");
+ if (read(fileno(fp), formats, (int) st.st_size) != st.st_size)
+ adios(form, "error reading format file");
formats[st.st_size] = '\0';
formats[st.st_size] = '\0';
- fclose (fp);
+ fclose(fp);
} else {
} else {
- formats = getcpy (format ? format : default_fs);
+ formats = getcpy(format ? format : default_fs);
}
}
- normalize (formats); /* expand escapes */
+ normalize(formats); /* expand escapes */
return formats;
}
return formats;
}
@@
-62,7
+62,7
@@
new_fs (char *form, char *format, char *default_fs)
*/
static void
*/
static void
-normalize (char *cp)
+normalize(char *cp)
{
char *dp;
{
char *dp;
@@
-71,34
+71,34
@@
normalize (char *cp)
*dp++ = *cp;
} else {
switch (*++cp) {
*dp++ = *cp;
} else {
switch (*++cp) {
- case 'b':
- *dp++ = '\b';
- break;
-
- case 'f':
- *dp++ = '\f';
- break;
-
- case 'n':
- *dp++ = '\n';
- break;
-
- case 'r':
- *dp++ = '\r';
- break;
-
- case 't':
- *dp++ = '\t';
- break;
-
- case '\n':
- break;
-
- case 0:
- cp--; /* fall */
- default:
- *dp++ = *cp;
- break;
+ case 'b':
+ *dp++ = '\b';
+ break;
+
+ case 'f':
+ *dp++ = '\f';
+ break;
+
+ case 'n':
+ *dp++ = '\n';
+ break;
+
+ case 'r':
+ *dp++ = '\r';
+ break;
+
+ case 't':
+ *dp++ = '\t';
+ break;
+
+ case '\n':
+ break;
+
+ case 0:
+ cp--; /* fall */
+ default:
+ *dp++ = *cp;
+ break;
}
}
}
}
}
}