Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed lots of superfluous includes.

Browse source 
Use debug() instead of printf().
This commit is contained in:
Martin Mares 2000-03-31 23:35:59 +00:00
parent a37410cbdd
commit 3cf4a2e2b0
3 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
filter/f-util.c
View file

@ -6,19 +6,7 @@
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/signal.h>
#include <setjmp.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/lists.h"
#include "lib/resource.h"
#include "lib/socket.h"
#include "nest/route.h"
#include "nest/protocol.h"
#include "nest/iface.h"
#include "conf/conf.h" #include "conf/conf.h"
#include "filter/filter.h" #include "filter/filter.h"

26
filter/filter.c
View file

@ -11,12 +11,6 @@
#undef LOCAL_DEBUG #undef LOCAL_DEBUG
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/signal.h>
#include <setjmp.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/lists.h" #include "lib/lists.h"
#include "lib/resource.h" #include "lib/resource.h"
@ -112,14 +106,14 @@ static void
tree_print(struct f_tree *t) tree_print(struct f_tree *t)
{ {
if (!t) { if (!t) {
printf( "() " ); debug( "() " );
return; return;
} }
printf( "[ " ); debug( "[ " );
tree_print( t->left ); tree_print( t->left );
printf( ", " ); val_print( t->from ); printf( ".." ); val_print( t->to ); printf( ", " ); debug( ", " ); val_print( t->from ); debug( ".." ); val_print( t->to ); debug( ", " );
tree_print( t->right ); tree_print( t->right );
printf( "] " ); debug( "] " );
} }
void void
@ -140,7 +134,7 @@ val_print(struct f_val v)
case T_ENUM: PRINTF( "(enum %x)%d", v.type, v.val.i ); break; case T_ENUM: PRINTF( "(enum %x)%d", v.type, v.val.i ); break;
default: PRINTF( "[unknown type %x]", v.type ); default: PRINTF( "[unknown type %x]", v.type );
} }
printf( buf ); debug( buf );
} }
static struct rte **f_rte, *f_rte_old; static struct rte **f_rte, *f_rte_old;
@ -283,12 +277,12 @@ interpret(struct f_inst *what)
res.type = T_BOOL; res.type = T_BOOL;
break; break;
case '0': case '0':
printf( "No operation\n" ); debug( "No operation\n" );
break; break;
case P('p',','): case P('p',','):
ONEARG; ONEARG;
if (what->a2.i != F_NONL) if (what->a2.i != F_NONL)
printf( "\n" ); debug( "\n" );
switch (what->a2.i) { switch (what->a2.i) {
case F_QUITBIRD: case F_QUITBIRD:
@ -420,7 +414,7 @@ interpret(struct f_inst *what)
v1.type = T_VOID; v1.type = T_VOID;
t = find_tree(what->a2.p, v1); t = find_tree(what->a2.p, v1);
if (!t) { if (!t) {
printf( "No else statement?\n "); debug( "No else statement?\n ");
break; break;
} }
} }
@ -554,11 +548,11 @@ filters_postconfig(void)
{ {
struct f_val res; struct f_val res;
if (startup_func) { if (startup_func) {
printf( "Launching startup function...\n" ); debug( "Launching startup function...\n" );
res = interpret(startup_func); res = interpret(startup_func);
if (res.type == F_ERROR) if (res.type == F_ERROR)
die( "Startup function resulted in error." ); die( "Startup function resulted in error." );
printf( "done\n" ); debug( "done\n" );
} }
} }

12
filter/tree.c
View file

@ -6,19 +6,7 @@
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/signal.h>
#include <setjmp.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/lists.h"
#include "lib/resource.h"
#include "lib/socket.h"
#include "nest/route.h"
#include "nest/protocol.h"
#include "nest/iface.h"
#include "conf/conf.h" #include "conf/conf.h"
#include "filter/filter.h" #include "filter/filter.h"