diff --git a/src/ChangeLog b/src/ChangeLog
index 5c07af86..2555c951 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-06  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* log.h: Declare log_init, log_close, and
+	log_request_redirect_output here.
+
 2003-11-05  Dennis Smit  <ds@nerds-incorporated.org>
 
 	* main.c: (main): added --preserve-permissions option.
diff --git a/src/log.h b/src/log.h
index c8c3ab1b..29c484ee 100644
--- a/src/log.h
+++ b/src/log.h
@@ -55,4 +55,8 @@ void logflush PARAMS ((void));
 void log_set_flush PARAMS ((int));
 int log_set_save_context PARAMS ((int));
 
+void log_init PARAMS ((const char *, int));
+void log_close PARAMS ((void));
+void log_request_redirect_output PARAMS ((const char *));
+
 #endif /* LOG_H */
diff --git a/src/main.c b/src/main.c
index eaeaa770..9a9aef2d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -81,11 +81,6 @@ extern char *version_string;
 
 extern struct cookie_jar *wget_cookie_jar;
 
-/* From log.c.  */
-void log_init PARAMS ((const char *, int));
-void log_close PARAMS ((void));
-void log_request_redirect_output PARAMS ((const char *));
-
 static RETSIGTYPE redirect_output_signal PARAMS ((int));
 
 const char *exec_name;
@@ -342,8 +337,11 @@ init_switches (void)
 	    }
 	}
     }
-  xzero (long_options[o]);
+  /* Terminate short_options. */
   *p = '\0';
+  /* No need for xzero(long_options[o]) because its storage is static
+     and it will be zeroed by default.  */
+  assert (o <= countof (long_options));
 }
 
 /* Print the usage message.  */