[Radmind-commit] radmind connect.c, 1.27, 1.28 connect.h, 1.12, 1.13 ktcheck.c, 1.112, 1.113 lapply.c, 1.132, 1.133 lcreate.c, 1.86, 1.87 lfdiff.c, 1.57, 1.58

[Patrick M. <ume...@us...>]

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3311

Modified Files:
	connect.c connect.h ktcheck.c lapply.c lcreate.c lfdiff.c 
Log Message:
Centralize v_logger code


Index: connect.c
===================================================================
RCS file: /cvsroot/radmind/radmind/connect.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** connect.c	24 Jan 2006 20:47:01 -0000	1.27
--- connect.c	13 Oct 2006 20:20:20 -0000	1.28
***************
*** 44,47 ****
--- 44,54 ----
  #endif
  
+     void
+ v_logger( char *line )
+ {
+     printf( "<<< %s\n", line );
+     return;
+ }
+ 
      static SNET *
  connectsn2( struct sockaddr_in *sin )

Index: connect.h
===================================================================
RCS file: /cvsroot/radmind/radmind/connect.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** connect.h	20 Mar 2006 18:16:45 -0000	1.12
--- connect.h	13 Oct 2006 20:20:20 -0000	1.13
***************
*** 25,26 ****
--- 25,27 ----
      char *trancksum, struct applefileinfo *afinfo );
  int stor_response( SNET *sn, int *respcount, struct timeval * );
+ void v_logger( char *string);

Index: lcreate.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lcreate.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** lcreate.c	20 Mar 2006 17:57:51 -0000	1.86
--- lcreate.c	13 Oct 2006 20:20:20 -0000	1.87
***************
*** 69,79 ****
  extern char             *ca, *cert, *privatekey;
  
-     static void
- v_logger( char *line )
- {
-     printf( "<<< %s\n", line );
-     return;
- }
- 
      int
  main( int argc, char **argv )
--- 69,72 ----

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** ktcheck.c	13 Oct 2006 18:49:59 -0000	1.112
--- ktcheck.c	13 Oct 2006 20:20:20 -0000	1.113
***************
*** 49,53 ****
  int cleandirs( char *path, struct llist *khead );
  int clean_client_dir( void );
- void output( char* string);
  int check( SNET *sn, char *type, char *path); 
  int createspecial( SNET *sn, struct list *special_list );
--- 49,52 ----
***************
*** 277,287 ****
  }
  
-     void
- output( char *string )
- {
-     printf( "<<< %s\n", string );
-     return;
- }
- 
      int
  createspecial( SNET *sn, struct list *special_list )
--- 276,279 ----
***************
*** 610,614 ****
  	case 'v':
  	    verbose = 1;
! 	    logger = output;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;
--- 602,606 ----
  	case 'v':
  	    verbose = 1;
! 	    logger = v_logger;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;

Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** lapply.c	6 May 2006 21:55:52 -0000	1.132
--- lapply.c	13 Oct 2006 20:20:20 -0000	1.133
***************
*** 72,76 ****
  void free_node( struct node *node );
  int do_line( char *tline, int present, struct stat *st, SNET *sn );
- void output( char *string);
  
     struct node *
--- 72,75 ----
***************
*** 99,109 ****
  }
  
-     void
- output( char *string )
- {
-     printf( "<<< %s\n", string );
-     return;
- }
- 
      int
  do_line( char *tline, int present, struct stat *st, SNET *sn )
--- 98,101 ----
***************
*** 321,325 ****
  	case 'v':
  	    verbose = 1;
! 	    logger = output;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;
--- 313,317 ----
  	case 'v':
  	    verbose = 1;
! 	    logger = v_logger;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;

Index: lfdiff.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lfdiff.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** lfdiff.c	20 Mar 2006 18:16:46 -0000	1.57
--- lfdiff.c	13 Oct 2006 20:20:20 -0000	1.58
***************
*** 38,43 ****
  #include "code.h"
  
- void output( char* string);
- 
  void			(*logger)( char * ) = NULL;
  extern struct timeval	timeout;
--- 38,41 ----
***************
*** 52,62 ****
  extern char             *ca, *cert, *privatekey;
  
-     void
- output( char *string )
- {
-     printf( "<<< %s\n", string );
-     return;
- }
- 
     static struct transcript *
  precedent_transcript( char *kfile, char *file, int where )
--- 50,53 ----
***************
*** 205,209 ****
  	case 'v':
  	    verbose = 1;
! 	    logger = output;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;
--- 196,200 ----
  	case 'v':
  	    verbose = 1;
! 	    logger = v_logger;
  	    if ( isatty( fileno( stdout ))) {
  		dodots = 1;