projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed `mhbuild -check': use the correct file.
[mmh]
/
uip
/
mhl.c
diff --git
a/uip/mhl.c
b/uip/mhl.c
index
e139a83
..
c78619e
100644
(file)
--- a/
uip/mhl.c
+++ b/
uip/mhl.c
@@
-105,11
+105,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, 0, 0
+ NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 0, NULL
};
static struct mcomp holder = {
};
static struct mcomp holder = {
- NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, 0
+ NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, NULL
};
struct pair {
};
struct pair {
@@
-178,12
+178,12
@@
static int mhldebug = 0;
#define NOTTY 0
static int ontty = NOTTY;
#define NOTTY 0
static int ontty = NOTTY;
-static int column;
+static unsigned int column;
static int lm;
static int ovoff;
static int term;
static int lm;
static int ovoff;
static int term;
-static int wid;
+static unsigned int wid;
static char *ovtxt;
static char *ovtxt;
@@
-1082,11
+1082,11
@@
putcomp(struct mcomp *c1, struct mcomp *c2, int flag)
count = 0;
if (cchdr) {
if (flag == TWOCOMP)
count = 0;
if (cchdr) {
if (flag == TWOCOMP)
- count = (c1->c_cwidth >= 0) ?
- c1->c_cwidth : strlen(c2->c_name) + 2;
+ count = (c1->c_cwidth >= 0) ? c1->c_cwidth :
+ (int)strlen(c2->c_name) + 2;
else
else
- count = (c1->c_cwidth >= 0) ?
- c1->c_cwidth : strlen(c1->c_text ?
+ 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;
c1->c_text : c1->c_name) + 2;
}
count += c1->c_offset;
@@
-1226,10
+1226,6
@@
putch(char ch)
static void
intrser(int i)
{
static void
intrser(int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL(SIGINT, intrser);
-#endif
-
discard(stdout);
putchar('\n');
longjmp(env, DONE);
discard(stdout);
putchar('\n');
longjmp(env, DONE);
@@
-1239,10
+1235,6
@@
intrser(int i)
static void
pipeser(int i)
{
static void
pipeser(int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL(SIGPIPE, pipeser);
-#endif
-
done(NOTOK);
}
done(NOTOK);
}
@@
-1250,10
+1242,6
@@
pipeser(int i)
static void
quitser(int i)
{
static void
quitser(int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL(SIGQUIT, quitser);
-#endif
-
putchar('\n');
fflush(stdout);
done(NOTOK);
putchar('\n');
fflush(stdout);
done(NOTOK);