against warnings (tftp_client.c, wcstombs.cxx)

[Sergei Gavrikov]

`make >/dev/null' catches one's foot

Sergei
-------------- next part --------------
diff -ur redboot/current/ChangeLog redboot.patched/current/ChangeLog
--- redboot/current/ChangeLog
+++ redboot.patched/current/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-28  Sergei Gavrikov  <w3sg@SoftHome.net>
+
+	* src/net/tftp_client.c (tftp_error_ack): Fix compiler warnings.
+
 2006-07-21  David Ho <davidkwho@gmail.com>
 
 	* src/flash.c (fis_start_update_directory): Fix build error when
diff -ur redboot/current/src/net/tftp_client.c redboot.patched/current/src/net/tftp_client.c
--- redboot/current/src/net/tftp_client.c
+++ redboot.patched/current/src/net/tftp_client.c
@@ -164,13 +164,13 @@
     struct tftphdr *hdr = (struct tftphdr *)tftp_stream.data;
 
     if (strlen(msg) > (SEGSIZE-1)) {
-      *(msg + SEGSIZE) = NULL;
+      *(msg + SEGSIZE) = 0;
     }
 
     if (tftp_stream.packets_received > 0) {
         hdr->th_opcode = htons(ERROR);
         hdr->th_code = code;
-        strcpy(&hdr->th_data, msg);
+        strcpy((char *)&hdr->th_data, msg);
         if (__udp_sendto(tftp_stream.data, (5 + strlen(msg)), 
                          &tftp_stream.from_addr, &tftp_stream.local_addr) < 0) {
             // Problem sending ACK
-------------- next part --------------
diff -ur language/c/libc/i18n/current/ChangeLog language/c/libc/i18n/current.patched/ChangeLog
--- language/c/libc/i18n/current/ChangeLog
+++ language/c/libc/i18n/current.patched/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-28  Sergei Gavrikov  <w3sg@SoftHome.net>
+
+	* src/wcstombs.cxx (wcstombs): unused variable removed.
+
 2006-08-11  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/wcstombs.cxx (wcstombs): Previous change should have
diff -ur language/c/libc/i18n/current/src/wcstombs.cxx language/c/libc/i18n/current.patched/src/wcstombs.cxx
--- language/c/libc/i18n/current/src/wcstombs.cxx
+++ language/c/libc/i18n/current.patched/src/wcstombs.cxx
@@ -194,7 +194,6 @@
 #endif /* CYGINT_LIBC_I18N_MB_REQUIRED */
   
   int count = 0;
-  char c;
 
   if (s == NULL) {
       while (*pwcs++ != 0) {