Replace variadic functions like sb_append and contains_str with variadic macros without a sentinel.

darcs-hash:20070928213227-75c98-2e7b06242acfd5fd0bf02ce77c41d52374f2363a.gz

1 files changed, 2 insertions, 2 deletions

diff --git a/env.c b/env.c
index 008521ad..55915e3b 100644
--- a/env.c
+++ b/env.c
@@ -466,7 +466,7 @@ static void setup_path()
 				sb_append( &b, path );
 			}
 			
-			sb_append2( &b,
+			sb_append( &b,
 						ARRAY_SEP_STR,
 						path_el[j],
 						(void *)0 );
@@ -713,7 +713,7 @@ int env_set( const wchar_t *key,
 	
 	CHECK( key, ENV_INVALID );
 		
-	if( val && CONTAINS( key, L"PWD", L"HOME" ) )
+	if( val && contains( key, L"PWD", L"HOME" ) )
 	{
 		void *context = halloc( 0, 0 );
 		const wchar_t *val_canonical = path_make_canonical( context, val );