projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a remaining RETSIGTYPE. Also change a few locals from int to unsigned to...
[mmh]
/
uip
/
mhlsbr.c
diff --git
a/uip/mhlsbr.c
b/uip/mhlsbr.c
index
420dbb6
..
4cd3770
100644
(file)
--- a/
uip/mhlsbr.c
+++ b/
uip/mhlsbr.c
@@
-2,8
+2,6
@@
/*
* mhlsbr.c -- main routines for nmh message lister
*
/*
* mhlsbr.c -- main routines for nmh message lister
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
@@
-273,9
+271,9
@@
static void putcomp (struct mcomp *, struct mcomp *, int);
static char *oneline (char *, long);
static void putstr (char *);
static void putch (char);
static char *oneline (char *, long);
static void putstr (char *);
static void putch (char);
-static RETSIGTYPE intrser (int);
-static RETSIGTYPE pipeser (int);
-static RETSIGTYPE quitser (int);
+static void intrser (int);
+static void pipeser (int);
+static void quitser (int);
static void face_format (struct mcomp *);
static int doface (struct mcomp *);
static void mhladios (char *, char *, ...);
static void face_format (struct mcomp *);
static int doface (struct mcomp *);
static void mhladios (char *, char *, ...);
@@
-794,8
+792,8
@@
parse (void)
static void
process (char *folder, char *fname, int ofilen, int ofilec)
{
static void
process (char *folder, char *fname, int ofilen, int ofilec)
{
- char *cp;
- FILE *fp;
+ char *cp = NULL;
+ FILE *fp = NULL;
struct mcomp *c1;
switch (setjmp (env)) {
struct mcomp *c1;
switch (setjmp (env)) {
@@
-1446,37
+1444,25
@@
putch (char ch)
}
}
-static RETSIGTYPE
+static void
intrser (int i)
{
intrser (int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGINT, intrser);
-#endif
-
discard (stdout);
putchar ('\n');
longjmp (env, DONE);
}
discard (stdout);
putchar ('\n');
longjmp (env, DONE);
}
-static RETSIGTYPE
+static void
pipeser (int i)
{
pipeser (int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGPIPE, pipeser);
-#endif
-
done (NOTOK);
}
done (NOTOK);
}
-static RETSIGTYPE
+static void
quitser (int i)
{
quitser (int i)
{
-#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGQUIT, quitser);
-#endif
-
putchar ('\n');
fflush (stdout);
done (NOTOK);
putchar ('\n');
fflush (stdout);
done (NOTOK);
@@
-1517,10
+1503,7
@@
face_format (struct mcomp *c1)
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <arpa/inet.h>
static int
doface (struct mcomp *c1)
static int
doface (struct mcomp *c1)
@@
-1544,7
+1527,9
@@
bad_faceproc: ;
}
memset(&hints, 0, sizeof(hints));
}
memset(&hints, 0, sizeof(hints));
+#ifdef AI_ADDRCONFIG
hints.ai_flags = AI_ADDRCONFIG;
hints.ai_flags = AI_ADDRCONFIG;
+#endif
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
@@
-1687,8
+1672,8
@@
doface (struct mcomp *c1)
int
mhlsbr (int argc, char **argv, FILE *(*action)())
{
int
mhlsbr (int argc, char **argv, FILE *(*action)())
{
- SIGNAL_HANDLER istat, pstat, qstat;
- char *cp;
+ SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL;
+ char *cp = NULL;
struct mcomp *c1;
switch (setjmp (mhlenv)) {
struct mcomp *c1;
switch (setjmp (mhlenv)) {