src/patches/net-tools-1.60-gcc34-3.patch

   1 Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org>
   2 Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org>
   3 Date: 2004-06-23
   4 Initial Package Version: 1.60
   5 Origin: N/A
   6 Upstream Status: N/A
   7 Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.
   8
   9 diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
  10 --- net-tools-1.60.orig/hostname.c      2001-04-08 17:04:23.000000000 +0000
  11 +++ net-tools-1.60/hostname.c   2004-06-24 06:22:16.913258663 +0000
  12 @@ -78,6 +78,7 @@
  13              fprintf(stderr, _("%s: name too long\n"), program_name);
  14              break;
  15          default:
  16 +           ((void)0);
  17          }
  18         exit(1);
  19      }
  20 @@ -98,6 +99,7 @@
  21             fprintf(stderr, _("%s: name too long\n"), program_name);
  22             break;
  23         default:
  24 +           ((void)0);
  25         }
  26         exit(1);
  27      };
  28 @@ -117,6 +119,7 @@
  29             fprintf(stderr, _("%s: name too long\n"), program_name);
  30             break;
  31         default:
  32 +           ((void)0);
  33         }
  34         exit(1);
  35      };
  36 @@ -174,6 +177,7 @@
  37         printf("%s\n", hp->h_name);
  38         break;
  39      default:
  40 +       ((void)0);
  41      }
  42  }
  43
  44 diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
  45 --- net-tools-1.60.orig/lib/inet_sr.c   2000-02-20 21:46:45.000000000 +0000
  46 +++ net-tools-1.60/lib/inet_sr.c        2004-06-24 06:22:01.967840446 +0000
  47 @@ -105,6 +105,7 @@
  48      case 2:
  49         isnet = 0; break;
  50      default:
  51 +       ((void)0);
  52      }
  53
  54      /* Fill in the other fields. */
  55 diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
  56 --- net-tools-1.60.orig/mii-tool.c      2000-05-21 14:31:17.000000000 +0000
  57 +++ net-tools-1.60/mii-tool.c   2004-06-24 06:22:01.971839755 +0000
  58 @@ -379,17 +379,17 @@
  59  /*--------------------------------------------------------------------*/
  60
  61  const char *usage =
  62 -"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
  63 -       -V, --version               display version information
  64 -       -v, --verbose               more verbose output
  65 -       -R, --reset                 reset MII to poweron state
  66 -       -r, --restart               restart autonegotiation
  67 -       -w, --watch                 monitor for link status changes
  68 -       -l, --log                   with -w, write events to syslog
  69 -       -A, --advertise=media,...   advertise only specified media
  70 -       -F, --force=media           force specified media technology
  71 -media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
  72 -       (to advertise both HD and FD) 100baseTx, 10baseT\n";
  73 +"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
  74 +"       -V, --version               display version information\n"
  75 +"       -v, --verbose               more verbose output\n"
  76 +"       -R, --reset                 reset MII to poweron state\n"
  77 +"       -r, --restart               restart autonegotiation\n"
  78 +"       -w, --watch                 monitor for link status changes\n"
  79 +"       -l, --log                   with -w, write events to syslog\n"
  80 +"       -A, --advertise=media,...   advertise only specified media\n"
  81 +"       -F, --force=media           force specified media technology\n"
  82 +"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
  83 +"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
  84
  85  int main(int argc, char **argv)
  86  {