2016-05-30 Paul Pluzhnikov <ppluzhnikov@google.com>

	[BZ 19653]
	* inet/if_index.c (__protocol_available): Delete #if 0'd code.
	* inet/ruserpass.c (ruserpass): Delete #if 0'd code.

diff --git a/ChangeLog b/ChangeLog
index a33eca3..e17b2ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-30  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       [BZ 19653]
+       * inet/if_index.c (__protocol_available): Delete #if 0'd code.
+       * inet/ruserpass.c (ruserpass): Delete #if 0'd code.
+
 2016-05-30  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        [BZ #20178]

diff --git a/inet/if_index.c b/inet/if_index.c
index b55e427..d8054fc 100644 (file)
--- a/inet/if_index.c
+++ b/inet/if_index.c
@@ -58,14 +58,3 @@ __if_nameindex (void)
 weak_alias (__if_nameindex, if_nameindex)
 libc_hidden_weak (if_nameindex)
 stub_warning (if_nameindex)
-
-#if 0
-void
-internal_function
-__protocol_available (int *have_inet, int *have_inet6)
-{
-  /* By default we assume that IPv4 is available, IPv6 not.  */
-  *have_inet = 1;
-  *have_inet6 = 0;
-}
-#endif

diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index dafc330..5b2747b 100644 (file)
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -192,81 +192,8 @@ next:
                        }
                        break;
                case ACCOUNT:
-#if 0
-                       if (fstat64(fileno(cfile), &stb) >= 0
-                           && (stb.st_mode & 077) != 0) {
-       warnx("Error: .netrc file is readable by others.");
-       warnx("Remove account or make file unreadable by others.");
-                               goto bad;
-                       }
-                       if (token() && *aacct == 0) {
-                               *aacct = malloc((unsigned) strlen(tokval) + 1);
-                               (void) strcpy(*aacct, tokval);
-                       }
-#endif
                        break;
                case MACDEF:
-#if 0
-                       if (proxy) {
-                               (void) fclose(cfile);
-                               return (0);
-                       }
-                       while ((c=getc_unlocked(cfile)) != EOF && c == ' '
-                              || c == '\t');
-                       if (c == EOF || c == '\n') {
-                               printf("Missing macdef name argument.\n");
-                               goto bad;
-                       }
-                       if (macnum == 16) {
-                               printf("Limit of 16 macros have already been defined\n");
-                               goto bad;
-                       }
-                       tmp = macros[macnum].mac_name;
-                       *tmp++ = c;
-                       for (i=0; i < 8 && (c=getc_unlocked(cfile)) != EOF &&
-                           !isspace(c); ++i) {
-                               *tmp++ = c;
-                       }
-                       if (c == EOF) {
-                               printf("Macro definition missing null line terminator.\n");
-                               goto bad;
-                       }
-                       *tmp = '\0';
-                       if (c != '\n') {
-                               while ((c=getc_unlocked(cfile)) != EOF
-                                      && c != '\n');
-                       }
-                       if (c == EOF) {
-                               printf("Macro definition missing null line terminator.\n");
-                               goto bad;
-                       }
-                       if (macnum == 0) {
-                               macros[macnum].mac_start = macbuf;
-                       }
-                       else {
-                               macros[macnum].mac_start = macros[macnum-1].mac_end + 1;
-                       }
-                       tmp = macros[macnum].mac_start;
-                       while (tmp != macbuf + 4096) {
-                               if ((c=getc_unlocked(cfile)) == EOF) {
-                               printf("Macro definition missing null line terminator.\n");
-                                       goto bad;
-                               }
-                               *tmp = c;
-                               if (*tmp == '\n') {
-                                       if (*(tmp-1) == '\0') {
-                                          macros[macnum++].mac_end = tmp - 1;
-                                          break;
-                                       }
-                                       *tmp = '\0';
-                               }
-                               tmp++;
-                       }
-                       if (tmp == macbuf + 4096) {
-                               printf("4K macro buffer exceeded\n");
-                               goto bad;
-                       }
-#endif
                        break;
                default:
                        warnx(_("Unknown .netrc keyword %s"), tokval);