send and whatnow: Remove deprecated -attach... switches.

They were changed to do nothing but warn on stderr that they were
deprecated in 521674623 and 035c5db34, both before 1.6's release, and so
can be removed ready for 1.7's release.

diff --git a/uip/send.c b/uip/send.c
index de94af2..5168dea 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -66,9 +66,6 @@
     X("saslmech mechanism", SASLminc(6), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(-4), USERSW) \
     X("saslmech mechanism", SASLminc(6), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(-4), USERSW) \

-    X("attach", -6, ATTACHSW) \
-    X("noattach", -8, NOATTACHSW) \
-    X("attachformat", 7, ATTACHFORMATSW) \

     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \


@@ -300,17 +297,6 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    vec[vecp++] = cp;
                    continue;
                        adios (NULL, "missing argument to %s", argp[-2]);
                    vec[vecp++] = cp;
                    continue;

-               
-               case ATTACHSW:
-                   inform("The -attach switch is deprecated");
-                   continue;
-               case NOATTACHSW:
-                   inform("The -noattach switch is deprecated");
-                   continue;
-
-               case ATTACHFORMATSW:
-                   inform("The -attachformat switch is deprecated");
-                   continue;

            }
        } else {
            msgs[msgp++] = cp;
            }
        } else {
            msgs[msgp++] = cp;

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index e2e0ceb..68c534e 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -57,8 +57,6 @@
     X("prompt string", 4, PRMPTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("prompt string", 4, PRMPTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

-    X("attach header-field-name", -6, ATTACHSW) \
-    X("noattach", -8, NOATTACHSW) \

 
 
 #define X(sw, minchars, id) id,
 
 
 #define X(sw, minchars, id) id,


@@ -197,14 +195,6 @@ WhatNow (int argc, char **argv)
                if (!(myprompt = *argp++) || *myprompt == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
                if (!(myprompt = *argp++) || *myprompt == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;

-
-           case ATTACHSW:
-               inform("The -attach switch is deprecated");
-               continue;
-
-           case NOATTACHSW:
-               inform("The -noattach switch is deprecated");
-               continue;

            }
        }
        if (drft)
            }
        }
        if (drft)


@@ -948,9 +938,6 @@ buildfile (char **argp, char *file)
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(4), USERSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(4), USERSW) \

-    X("attach fieldname", 6, SNDATTACHSW) \
-    X("noattach", 0, SNDNOATTACHSW) \
-    X("attachformat", 7, SNDATTACHFORMAT) \

     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \


@@ -1190,17 +1177,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    /* FALLTHRU */
                case SNDRFSW:
                    continue;
                    /* FALLTHRU */
                case SNDRFSW:
                    continue;

-
-               case SNDATTACHSW:
-                   inform("The -attach switch is deprecated");
-                   continue;
-               case SNDNOATTACHSW:
-                   inform("The -noattach switch is deprecated");
-                   continue;
-
-               case SNDATTACHFORMAT:
-                   inform("The -attachformat switch is deprecated");
-                   continue;

            }
        }
        inform("usage: %s [switches]", sp);
            }
        }
        inform("usage: %s [switches]", sp);