/*
+ * $Id: comment.c,v 1.10 2009-10-13 22:55:37 didg Exp $
+ *
* Copyright (c) 1990,1994 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
-#include <sys/syslog.h>
+#include <atalk/logger.h>
#include <sys/param.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include "comment.h"
char *comcont = "%%+";
-compop()
+void compop( void )
{
struct comstate *cs;
free( cs );
}
-compush( comment )
- struct papd_comment *comment;
+void compush(struct papd_comment *comment)
{
struct comstate *cs;
if (( cs = (struct comstate *)malloc( sizeof( struct comstate ))) ==
NULL ) {
- syslog( LOG_ERR, "malloc: %m" );
+ LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
exit( 1 );
}
comstate = cs;
}
-comswitch( comments, handler )
- struct papd_comment *comments;
- int (*handler)();
+int comswitch(struct papd_comment *comments, int (*handler)())
{
struct papd_comment *c, *comment = NULL;
}
}
if ( comment == NULL || comment->c_handler != handler ) {
- syslog( LOG_ERR, "comswitch: can't find handler!" );
+ LOG(log_error, logtype_papd, "comswitch: can't find handler!" );
return( -1 );
}
compop();
return( 0 );
}
-comcmp( start, stop, str, how )
- char *start, *stop, *str;
- int how;
+int comcmp( char *start, char *stop, char *str,int how)
{
int cc, len;
len = stop - start;
cc = strlen( str );
if ( how & C_FULL ) {
- if ( cc == len & strncmp( str, start, cc ) == 0 ) {
+ if ( (cc == len) && (strncmp( str, start, cc ) == 0) ) {
return( 0 );
}
} else {
- if ( cc <= len && strncmp( str, start, cc ) == 0 ) {
+ if ( (cc <= len) && (strncmp( str, start, cc ) == 0) ) {
return( 0 );
}
}
return( 1 );
}
- struct papd_comment *
-commatch( start, stop, comments )
- char *start, *stop;
- struct papd_comment comments[];
+struct papd_comment *commatch( char *start, char *stop, struct papd_comment comments[])
{
struct papd_comment *comment;
}
}
- char *
-comtoken( start, stop, pos, delim )
- char *start, *stop, *pos, *delim;
+char *comtoken( char *start, char *stop, char *pos, char *delim)
{
if ( pos < start || pos > stop ) {
abort();