projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cscope.files was missing mts/smtp/*.
[mmh]
/
uip
/
mhlsbr.c
diff --git
a/uip/mhlsbr.c
b/uip/mhlsbr.c
index
68a265d
..
6335463
100644
(file)
--- a/
uip/mhlsbr.c
+++ b/
uip/mhlsbr.c
@@
-13,7
+13,7
@@
#include <h/fmt_scan.h>
#include <h/tws.h>
#include <h/utils.h>
#include <h/fmt_scan.h>
#include <h/tws.h>
#include <h/utils.h>
-#include <setjmp.h>
+#include <h/m_setjmp.h>
#include <signal.h>
/*
#include <signal.h>
/*
@@
-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;
@@
-796,7
+796,7
@@
process (char *folder, char *fname, int ofilen, int ofilec)
FILE *fp = NULL;
struct mcomp *c1;
FILE *fp = NULL;
struct mcomp *c1;
- switch (setjmp (env)) {
+ switch (m_setjmp (env)) {
case OK:
if (fname) {
fp = mhl_action ? (*mhl_action) (fname) : fopen (fname, "r");
case OK:
if (fname) {
fp = mhl_action ? (*mhl_action) (fname) : fopen (fname, "r");
@@
-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;
@@
-1682,7
+1682,7
@@
mhlsbr (int argc, char **argv, FILE *(*action)())
char *cp = NULL;
struct mcomp *c1;
char *cp = NULL;
struct mcomp *c1;
- switch (setjmp (mhlenv)) {
+ switch (m_setjmp (mhlenv)) {
case OK:
cp = invo_name;
sleepsw = 0; /* XXX */
case OK:
cp = invo_name;
sleepsw = 0; /* XXX */
@@
-1761,7
+1761,7
@@
m_popen (char *name)
if (pipe (pd) == NOTOK)
adios ("pipe", "unable to");
if (pipe (pd) == NOTOK)
adios ("pipe", "unable to");
- switch (m_pid = vfork ()) {
+ switch (m_pid = vfork()) {
case NOTOK:
adios ("fork", "unable to");
case NOTOK:
adios ("fork", "unable to");