projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed HAVE_STRUCT_TM_TM_GMTOFF support because it didn't work on Cygwin and isn...
[mmh]
/
uip
/
mhlsbr.c
diff --git
a/uip/mhlsbr.c
b/uip/mhlsbr.c
index
4cd3770
..
4c2558f
100644
(file)
--- a/
uip/mhlsbr.c
+++ b/
uip/mhlsbr.c
@@
-134,11
+134,11
@@
static struct mcomp *fmthd = NULL;
static struct mcomp *fmttl = NULL;
static struct mcomp global = {
static struct mcomp *fmttl = NULL;
static struct mcomp global = {
- NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 40, BELL, 0
+ NULL, NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 40, BELL, NULL
};
static struct mcomp holder = {
};
static struct mcomp holder = {
- NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, 0
+ NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, NULL
};
struct pair {
};
struct pair {
@@
-218,13
+218,13
@@
static int mhldebug = 0;
static int ontty = NOTTY;
static int row;
static int ontty = NOTTY;
static int row;
-static int column;
+static unsigned int column;
static int lm;
static int llim;
static int ovoff;
static int term;
static int lm;
static int llim;
static int ovoff;
static int term;
-static int wid;
+static unsigned int wid;
static char *ovtxt;
static char *ovtxt;
@@
-790,7
+790,7
@@
parse (void)
static void
static void
-process (char *folder, char *fname, int ofilen, int ofilec)
+process (char *folder, char *volatile fname, int ofilen, int ofilec)
{
char *cp = NULL;
FILE *fp = NULL;
{
char *cp = NULL;
FILE *fp = NULL;
@@
-1275,9
+1275,9
@@
putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
if (cchdr) {
if (flag == TWOCOMP)
count = (c1->c_cwidth >= 0) ? c1->c_cwidth
if (cchdr) {
if (flag == TWOCOMP)
count = (c1->c_cwidth >= 0) ? c1->c_cwidth
- : strlen (c2->c_name) + 2;
+ : (int) strlen (c2->c_name) + 2;
else
else
- count = (c1->c_cwidth >= 0) ? c1->c_cwidth
+ count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth
: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
}
count += c1->c_offset;
: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
}
count += c1->c_offset;
@@
-1447,6
+1447,8
@@
putch (char ch)
static void
intrser (int i)
{
static void
intrser (int i)
{
+ NMH_UNUSED (i);
+
discard (stdout);
putchar ('\n');
longjmp (env, DONE);
discard (stdout);
putchar ('\n');
longjmp (env, DONE);
@@
-1456,6
+1458,8
@@
intrser (int i)
static void
pipeser (int i)
{
static void
pipeser (int i)
{
+ NMH_UNUSED (i);
+
done (NOTOK);
}
done (NOTOK);
}
@@
-1463,6
+1467,8
@@
pipeser (int i)
static void
quitser (int i)
{
static void
quitser (int i)
{
+ NMH_UNUSED (i);
+
putchar ('\n');
fflush (stdout);
done (NOTOK);
putchar ('\n');
fflush (stdout);
done (NOTOK);