4 files changed, 16 insertions, 4 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index f67f794579a..6069325e8a8 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* t4ht.c (main): Initialize addr and media in order to avoid
+	compiler warnings.  Use '#if 0' to skip unreachable code.
+
 2010-11-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* t4ht.c (filterGifScript): Avoid 'filtered_script might be used
diff --git a/Build/source/texk/tex4htk/t4ht.c b/Build/source/texk/tex4htk/t4ht.c
index cb5091404eb..dd6a898d5a9 100644
--- a/Build/source/texk/tex4htk/t4ht.c
+++ b/Build/source/texk/tex4htk/t4ht.c
@@ -521,7 +521,7 @@ static FILE* f_open( ARG_II(const char*,const char*) );
 static FILE* f_home_open( ARG_II(const char*,const char*) );
 
 
-static FILE* open_file( const ARG_II(C_CHAR *, const C_CHAR *) );
+static FILE* open_file( ARG_II(const C_CHAR *, const C_CHAR *) );
 
 
 static void err_i( ARG_I(int) );
@@ -2039,7 +2039,7 @@ if( check_tex4ht_c_err ){
   
 {     
 Q_CHAR *file_name, file_mode[5];
-int i, start_loc, end_loc, addr;
+int i, start_loc, end_loc, addr = 0;
 char rec_op, *ch;
 static struct files_rec *to_rec, *from_rec,
    *opened_files = (struct files_rec *) 0,
@@ -2362,7 +2362,7 @@ if( status ){
 
 
       if( status ){            Q_CHAR *key, *body, *media;
-         body = key = match[1];
+         media = body = key = match[1];
          
 while( *body && (*body != ' ') ){ body++; }
 if( *body == ' ' ){ media = body; *(body++) = '\0'; }
@@ -2404,6 +2404,7 @@ if( debug ){
 }
 
  }
+#if 0 /* unreachable */
   else if( last_rec ){ 
 last_rec->body = (Q_CHAR *)  r_alloc((void *) last_rec->body,
       (size_t) strlen((char *) last_rec->body)
@@ -2416,6 +2417,7 @@ if( debug ){
 }
 
  }
+#endif /* 0, unreachable */
 }
 
 
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index a592d93f0c2..a8105480599 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.web (pdf_out_colorstack): There are no 'othercases'.
+	Fix from Heiko Oberdiek <heiko.oberdiek@googlemail.com>.
+
 2010-11-14  Karl Berry  <karl@tug.org>
 
 	* writet1.c: endless formatting tweaks.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index e3486c44c87..0ab37ce8734 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -18243,7 +18243,7 @@ begin
     end;
     colorstack_pop: literal_mode := colorstackpop(stack_no);
     colorstack_current: literal_mode := colorstackcurrent(stack_no);
-    othercases do_nothing
+    othercases confusion("pdfcolorstack")
     endcases;
     if cur_length > 0 then begin
         s := make_string;