* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: utils.c,v 1.25 2008/06/03 12:06:37 paulus Exp $"
-
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
extern char *strerror();
#endif
-static void logit __P((int, char *, va_list));
-static void log_write __P((int, char *));
-static void vslp_printer __P((void *, char *, ...));
-static void format_packet __P((u_char *, int, printer_func, void *));
+static void logit(int, char *, va_list);
+static void log_write(int, char *);
+static void vslp_printer(void *, char *, ...);
+static void format_packet(u_char *, int, printer_func, void *);
struct buffer_info {
char *ptr;
* always leaves destination null-terminated (for len > 0).
*/
size_t
-strlcpy(dest, src, len)
- char *dest;
- const char *src;
- size_t len;
+strlcpy(char *dest, const char *src, size_t len)
{
size_t ret = strlen(src);
* always leaves destination null-terminated (for len > 0).
*/
size_t
-strlcat(dest, src, len)
- char *dest;
- const char *src;
- size_t len;
+strlcat(char *dest, const char *src, size_t len)
{
size_t dlen = strlen(dest);
* Returns the number of chars put into buf.
*/
int
-slprintf __V((char *buf, int buflen, char *fmt, ...))
+slprintf(char *buf, int buflen, char *fmt, ...)
{
va_list args;
int n;
-#if defined(__STDC__)
va_start(args, fmt);
-#else
- char *buf;
- int buflen;
- char *fmt;
- va_start(args);
- buf = va_arg(args, char *);
- buflen = va_arg(args, int);
- fmt = va_arg(args, char *);
-#endif
n = vslprintf(buf, buflen, fmt, args);
va_end(args);
return n;
#define OUTCHAR(c) (buflen > 0? (--buflen, *buf++ = (c)): 0)
int
-vslprintf(buf, buflen, fmt, args)
- char *buf;
- int buflen;
- char *fmt;
- va_list args;
+vslprintf(char *buf, int buflen, char *fmt, va_list args)
{
int c, i, n;
int width, prec, fillch;
* vslp_printer - used in processing a %P format
*/
static void
-vslp_printer __V((void *arg, char *fmt, ...))
+vslp_printer(void *arg, char *fmt, ...)
{
int n;
va_list pvar;
struct buffer_info *bi;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- void *arg;
- char *fmt;
- va_start(pvar);
- arg = va_arg(pvar, void *);
- fmt = va_arg(pvar, char *);
-#endif
bi = (struct buffer_info *) arg;
n = vslprintf(bi->ptr, bi->len, fmt, pvar);
*/
void
-log_packet(p, len, prefix, level)
- u_char *p;
- int len;
- char *prefix;
- int level;
+log_packet(u_char *p, int len, char *prefix, int level)
{
init_pr_log(prefix, level);
format_packet(p, len, pr_log, &level);
* calling `printer(arg, format, ...)' to output it.
*/
static void
-format_packet(p, len, printer, arg)
- u_char *p;
- int len;
- printer_func printer;
- void *arg;
+format_packet(u_char *p, int len, printer_func printer, void *arg)
{
int i, n;
u_short proto;
static int llevel; /* level for logging */
void
-init_pr_log(prefix, level)
- const char *prefix;
- int level;
+init_pr_log(const char *prefix, int level)
{
linep = line;
if (prefix != NULL) {
}
void
-end_pr_log()
+end_pr_log(void)
{
if (linep != line) {
*linep = 0;
* pr_log - printer routine for outputting to syslog
*/
void
-pr_log __V((void *arg, char *fmt, ...))
+pr_log(void *arg, char *fmt, ...)
{
int l, n;
va_list pvar;
char *p, *eol;
char buf[256];
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- void *arg;
- char *fmt;
- va_start(pvar);
- arg = va_arg(pvar, void *);
- fmt = va_arg(pvar, char *);
-#endif
n = vslprintf(buf, sizeof(buf), fmt, pvar);
va_end(pvar);
* printer.
*/
void
-print_string(p, len, printer, arg)
- char *p;
- int len;
- printer_func printer;
- void *arg;
+print_string(char *p, int len, printer_func printer, void *arg)
{
int c;
* logit - does the hard work for fatal et al.
*/
static void
-logit(level, fmt, args)
- int level;
- char *fmt;
- va_list args;
+logit(int level, char *fmt, va_list args)
{
char buf[1024];
}
static void
-log_write(level, buf)
- int level;
- char *buf;
+log_write(int level, char *buf)
{
syslog(level, "%s", buf);
if (log_to_fd >= 0 && (level != LOG_DEBUG || debug)) {
* fatal - log an error message and die horribly.
*/
void
-fatal __V((char *fmt, ...))
+fatal(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_ERR, fmt, pvar);
va_end(pvar);
* error - log an error message.
*/
void
-error __V((char *fmt, ...))
+error(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_ERR, fmt, pvar);
va_end(pvar);
* warn - log a warning message.
*/
void
-warn __V((char *fmt, ...))
+warn(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_WARNING, fmt, pvar);
va_end(pvar);
* notice - log a notice-level message.
*/
void
-notice __V((char *fmt, ...))
+notice(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_NOTICE, fmt, pvar);
va_end(pvar);
* info - log an informational message.
*/
void
-info __V((char *fmt, ...))
+info(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_INFO, fmt, pvar);
va_end(pvar);
* dbglog - log a debug message.
*/
void
-dbglog __V((char *fmt, ...))
+dbglog(char *fmt, ...)
{
va_list pvar;
-#if defined(__STDC__)
va_start(pvar, fmt);
-#else
- char *fmt;
- va_start(pvar);
- fmt = va_arg(pvar, char *);
-#endif
logit(LOG_DEBUG, fmt, pvar);
va_end(pvar);
* lock - create a lock file for the named device
*/
int
-lock(dev)
- char *dev;
+lock(char *dev)
{
#ifdef LOCKLIB
int result;
* between when the parent died and the child rewrote the lockfile).
*/
int
-relock(pid)
- int pid;
+relock(int pid)
{
#ifdef LOCKLIB
/* XXX is there a way to do this? */
* unlock - remove our lockfile
*/
void
-unlock()
+unlock(void)
{
if (lock_file[0]) {
#ifdef LOCKLIB
projects / ppp.git / blobdiff