svn commit: trunk/busybox/editors

[aldot at busybox.net]

Author: aldot
Date: 2006-03-01 12:14:16 -0800 (Wed, 01 Mar 2006)
New Revision: 14399

Log:
- fix compilation of sed.
  error: static declaration of 'free_and_close_stuff' follows non-static declaration
  Tiny whitespace cleanup while at it,
  also make sure that we don't use CONFIG_ anymore.

Rob, hope this is ok w/ you..


Modified:
   trunk/busybox/editors/sed.c


Changeset:
Modified: trunk/busybox/editors/sed.c
===================================================================
--- trunk/busybox/editors/sed.c	2006-03-01 19:08:24 UTC (rev 14398)
+++ trunk/busybox/editors/sed.c	2006-03-01 20:14:16 UTC (rev 14399)
@@ -9,7 +9,7 @@
  * Copyright (C) 2003,2004 by Rob Landley <rob at landley.net>
  *
  * MAINTAINER: Rob Landley <rob at landley.net>
- * 
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -76,7 +76,7 @@
     regex_t *sub_match;	/* For 's/sub_match/string/' */
     int beg_line;		/* 'sed 1p'   0 == apply commands to all lines */
     int end_line;		/* 'sed 1,3p' 0 == one line only. -1 = last line ($) */
-	
+
     FILE *file;			/* File (sw) command writes to, -1 for none. */
     char *string;		/* Data string for (saicytb) commands. */
 
@@ -122,8 +122,8 @@
 };
 static struct append_list *append_head=NULL, *append_tail=NULL;
 
-void free_and_close_stuff(void);
-#ifdef CONFIG_FEATURE_CLEAN_UP
+static void free_and_close_stuff(void);
+#if ENABLE_FEATURE_CLEAN_UP
 static void free_and_close_stuff(void)
 {
 	sed_cmd_t *sed_cmd = sed_cmd_head.next;
@@ -1200,15 +1200,15 @@
 						if(-1==(nonstdoutfd=mkstemp(outname)))
 							bb_error_msg_and_die("no temp file");
 						nonstdout=fdopen(nonstdoutfd,"w");
-						
+
 						/* Set permissions of output file */
-						
+
 						fstat(fileno(file),&statbuf);
 						fchmod(nonstdoutfd,statbuf.st_mode);
 						add_input_file(file);
 						process_files();
 						fclose(nonstdout);
-						
+
 						nonstdout=stdout;
 						unlink(argv[i]);
 						rename(outname,argv[i]);