remove #if 0 code blocks

This code has been commented out for over 6 months
(and much of it for more than 10 years).

diff --git a/compose.c b/compose.c
index 5f248eed824ec68823acc2ef79e23e26605c0141..0f261757667ebbf83da21169e9f9807ca81d7b2e 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -1150,14 +1150,6 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
        CHECK_COUNT;
        idx[menu->current]->content->unlink = !idx[menu->current]->content->unlink;
 
-#if 0
-        /* OPTRESOLVE is otherwise ignored on this menu.
-        * Where's the bug?
-        */
-
-        if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
-         menu->current++;
-# endif
        menu->redraw = REDRAW_INDEX;
         /* No send2hook since this doesn't change the message. */
        break;

diff --git a/copy.c b/copy.c
index a30b1f163b6ae82a0a0ae559bb1c4123b1be3ae7..4b4ccdc05d72ba2a8cc6c985b64a383ee1408cf7 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -289,11 +289,6 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
   {
     if (headers[x])
     {
-#if 0
-      if (flags & CH_DECODE)
-       rfc2047_decode (&headers[x]);
-#endif
-
       /* We couldn't do the prefixing when reading because RFC 2047
        * decoding may have concatenated lines.
        */

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 2ac4ecaba76f751a82293f6b372da5f60a07a33d..d09e8ae6a2079d06857a83344d4eb38320984645 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -3832,28 +3832,6 @@ static crypt_key_t *get_candidates (LIST * hints, unsigned int app, int secret)
           if (key->disabled)
             flags |= KEYFLAG_DISABLED;
 
-#if 0 /* DISABLED code */
-          if (!flags)
-            {
-             /* Bug in gpg.  Capabilities are not listed for secret
-                keys.  Try to deduce them from the algorithm. */
-
-             switch (key->subkeys[0].pubkey_algo)
-                {
-                case GPGME_PK_RSA:
-                  flags |= KEYFLAG_CANENCRYPT;
-                  flags |= KEYFLAG_CANSIGN;
-                  break;
-                case GPGME_PK_ELG_E:
-                  flags |= KEYFLAG_CANENCRYPT;
-                  break;
-                case GPGME_PK_DSA:
-                  flags |= KEYFLAG_CANSIGN;
-                  break;
-                }
-            }
-#endif /* DISABLED code */
-
          for (idx = 0, uid = key->uids; uid; idx++, uid = uid->next)
             {
               k = safe_calloc (1, sizeof *k);
@@ -4447,10 +4425,6 @@ static char *find_keys (ADDRESS *adrlist, unsigned int app, int oppenc_mode)
   int r;
   int key_selected;
 
-#if 0
-  *r_application = APPLICATION_PGP|APPLICATION_SMIME;
-#endif
-
   for (p = adrlist; p ; p = p->next)
     {
       key_selected = 0;
@@ -4491,13 +4465,8 @@ static char *find_keys (ADDRESS *adrlist, unsigned int app, int oppenc_mode)
                   }
                 else if (! oppenc_mode)
                   {
-#if 0
-                    k_info = crypt_getkeybystr (crypt_hook_val, KEYFLAG_CANENCRYPT,
-                                                *r_application, &forced_valid);
-#else
                     k_info = crypt_getkeybystr (crypt_hook_val, KEYFLAG_CANENCRYPT,
                                                 app, &forced_valid);
-#endif
                   }
               }
             else if (r == MUTT_NO)
@@ -4529,11 +4498,7 @@ static char *find_keys (ADDRESS *adrlist, unsigned int app, int oppenc_mode)
 
             k_info = crypt_ask_for_key (buf, q->mailbox,
                                         KEYFLAG_CANENCRYPT,
-#if 0
-                                        *r_application,
-#else
                                         app,
-#endif
                                         &forced_valid);
           }
 
@@ -4548,13 +4513,6 @@ static char *find_keys (ADDRESS *adrlist, unsigned int app, int oppenc_mode)
 
         keyID = crypt_fpr_or_lkeyid (k_info);
 
-#if 0
-        if (k_info->flags & KEYFLAG_ISX509)
-          *r_application &= ~APPLICATION_PGP;
-        if (!(k_info->flags & KEYFLAG_ISX509))
-          *r_application &= ~APPLICATION_SMIME;
-#endif
-
     bypass_selection:
         keylist_size += mutt_strlen (keyID) + 4 + 1;
         safe_realloc (&keylist, keylist_size);

diff --git a/crypt.c b/crypt.c
index 8132f16513d0169a8ac2f0ca6ee544631412d57f..4c21e482bec4cd91fc1de75421847abd3d60a49c 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -513,13 +513,9 @@ int mutt_is_application_smime (BODY *m)
     {
       len++;
       if (!ascii_strcasecmp ((t+len), "p7m"))
-#if 0
-       return SMIMEENCRYPT;
-#else
       /* Not sure if this is the correct thing to do, but
          it's required for compatibility with Outlook */
        return (SMIMESIGN|SMIMEOPAQUE);
-#endif
       else if (!ascii_strcasecmp ((t+len), "p7s"))
        return (SMIMESIGN|SMIMEOPAQUE);
     }

diff --git a/curs_main.c b/curs_main.c
index 5ae804a42e3c589c8579b8714cc81cd8f39f8ea1..7f0d8e1deeb848d0e7a0e5df2de8e1414df1113a 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -3224,9 +3224,6 @@ int mutt_index_menu (void)
       mutt_clear_pager_position ();
       menu->menu = MENU_MAIN;
       menu->redraw = REDRAW_FULL;
-#if 0
-      set_option (OPTWEED); /* turn header weeding back on. */
-#endif
     }
 
     if (done) break;

diff --git a/init.c b/init.c
index 3b03d68857e91f69141aaf7b68d5fb8b282c2c12..9df285993087ed747cd5f1122017b91fa9b19dd4 100644 (file)
--- a/init.c
+++ b/init.c
@@ -4022,10 +4022,6 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     mutt_str_replace(&Spoolfile, VirtIncoming->path);
 #endif
 
-#if 0
-  set_option (OPTWEED); /* turn weeding on by default */
-#endif
-
   FREE (&err.data);
 }
 

diff --git a/main.c b/main.c
index ff04d4baae4be4f6ef48ee24947cc0298314cef0..49906ddb4825315871bb8cb3e6d6b49d5df09300 100644 (file)
--- a/main.c
+++ b/main.c
@@ -152,10 +152,8 @@ static void start_curses (void)
     puts (_("Error initializing terminal."));
     exit (1);
   }
-#if 1 /* USE_SLANG_CURSES  - commenting out suggested in #455. */
   /* slang requires the signal handlers to be set after initializing */
   mutt_signal_init ();
-#endif
   ci_start_color ();
   keypad (stdscr, true);
   cbreak ();

diff --git a/mh.c b/mh.c
index 9267de938e2a9c95e70b6368370104096518a2bf..7362ad9abc7104bbc007faa426c76ef50c1de29a 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -139,19 +139,6 @@ static short mhs_set (struct mh_sequences *mhs, int i, short f)
   return mhs->flags[i];
 }
 
-#if 0
-
-/* unused */
-
-static short mhs_unset (struct mh_sequences *mhs, int i, short f)
-{
-  mhs_alloc (mhs, i);
-  mhs->flags[i] &= ~f;
-  return mhs->flags[i];
-}
-
-#endif
-
 static int mh_read_token (char *t, int *first, int *last)
 {
   char *p;

diff --git a/mutt.h b/mutt.h
index 2a049fd465ffe795b8314e316afb5782b1da75b9..3faf65b33c565ec468ba556d849a524b8a16a7c9 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -543,9 +543,6 @@ enum
   OPTPGPCHECKEXIT,
   OPTPGPLONGIDS,
   OPTPGPAUTODEC,
-#if 0
-  OPTPGPENCRYPTSELF,
-#endif
   OPTPGPRETAINABLESIG,
   OPTPGPSTRICTENC,
   OPTFORWDECRYPT,

diff --git a/mutt_ssl.c b/mutt_ssl.c
index dbec6c8b45a497dd765c733992a860b074161bb7..b72e77114b5d9581826ce30a5b7db4d9e334b760 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -605,9 +605,6 @@ static int ssl_socket_close (CONNECTION * conn)
 
     /* hold onto this for the life of mutt, in case we want to reconnect.
      * The purist in me wants a mutt_exit hook. */
-#if 0
-    X509_free (data->cert);
-#endif
     SSL_free (data->ssl);
     SSL_CTX_free (data->ctx);
     FREE (&conn->sockdata);

diff --git a/muttlib.c b/muttlib.c
index 7837a633596cb4a258a10c1232773fc37e648043..7c9cbe67c7b0cddba76309d000f641cb9a33ae7b 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1735,18 +1735,6 @@ void mutt_FormatString (char *dest,              /* output buffer */
     }
   }
   *wptr = 0;
-
-#if 0
-  if (flags & MUTT_FORMAT_MAKEPRINT)
-  {
-    /* Make sure that the string is printable by changing all non-printable
-       chars to dots, or spaces for non-printable whitespace */
-    for (cp = dest ; *cp ; cp++)
-      if (!IsPrint (*cp) &&
-         !((flags & MUTT_FORMAT_TREE) && (*cp <= MUTT_TREE_MAX)))
-       *cp = isspace ((unsigned char) *cp) ? ' ' : '.';
-  }
-#endif
 }
 
 /* This function allows the user to specify a command to read stdout from in

diff --git a/pager.c b/pager.c
index 722abfeec9d62e0f046ef25ef3b128e151562f39..7c5890b612d2b4696f4f984b4199c0cb96d69b01 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -765,13 +765,8 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
   }
   else if (mutt_strncmp ("\033[0m", raw, 4) == 0)      /* a little hack... */
     lineInfo[n].type = MT_COLOR_NORMAL;
-#if 0
-  else if (mutt_strncmp ("[-- ", buf, 4) == 0)
-    lineInfo[n].type = MT_COLOR_ATTACHMENT;
-#else
   else if (check_attachment_marker ((char *) raw) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
-#endif
   else if (mutt_strcmp ("-- \n", buf) == 0 || mutt_strcmp ("-- \r\n", buf) == 0)
   {
     i = n + 1;

diff --git a/pattern.c b/pattern.c
index 8d403c007f4048b8e119c3bc5afc1dd9d3e3e0a5..29b7ca611d312aaa49fd9619608d955abcc8ca30 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -323,12 +323,6 @@ static int eat_regexp (pattern_t *pat, BUFFER *s, BUFFER *err)
     return (-1);
   }
 
-#if 0
-  /* If there are no RE metacharacters, use simple search anyway */
-  if (!pat->stringmatch && !strpbrk (buf.data, "|[{.*+?^$"))
-    pat->stringmatch = 1;
-#endif
-
   if (pat->stringmatch)
   {
     pat->p.str = safe_strdup (buf.data);

diff --git a/pgp.c b/pgp.c
index 71041f49a2fe50e433f0219ad967dd151fc2b566..d9f9dfd6b433fdb6dc1dad0b71da122a1a7005d2 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1609,16 +1609,6 @@ BODY *pgp_traditional_encryptsign (BODY *a, int flags, char *keylist)
 
   b->filename = safe_strdup (pgpoutfile);
 
-#if 0
-  /* The following is intended to give a clue to some completely brain-dead
-   * "mail environments" which are typically used by large corporations.
-   */
-
-  b->d_filename = safe_strdup ("msg.pgp");
-  b->use_disp = 1;
-
-#endif
-
   b->disposition = DISPNONE;
   b->unlink   = 1;
 

diff --git a/pgpkey.c b/pgpkey.c
index 988c354db5f77538722ebf44e256c48c0e205f4c..b1cf218109eb98893e2573322aceb1557e5a1dc0 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -633,11 +633,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys,
        }
       }
 
-# if 0
-      kp = pgp_principal_key (KeyTable[menu->current]->parent);
-# else
       kp = KeyTable[menu->current]->parent;
-# endif
       done = 1;
       break;
 

diff --git a/pgplib.c b/pgplib.c
index baaf8cf9543dcc375ec583fe2c2aeb65d0492202..a828219e80379b46d693a4227b48a6b7f9771592 100644 (file)
--- a/pgplib.c
+++ b/pgplib.c
@@ -54,31 +54,6 @@ const char *pgp_pkalgbytype (unsigned char type)
   }
 }
 
-
-
-/* unused */
-
-#if 0
-
-static const char *hashalgbytype (unsigned char type)
-{
-  switch (type)
-  {
-  case 1:
-    return "MD5";
-  case 2:
-    return "SHA1";
-  case 3:
-    return "RIPE-MD/160";
-  case 4:
-    return "HAVAL";
-  default:
-    return "unknown";
-  }
-}
-
-#endif
-
 short pgp_canencrypt (unsigned char type)
 {
   switch (type)

diff --git a/pgppubring.c b/pgppubring.c
index 027b767d24d8005de0d5d7ff07b50caf7a24ebf2..b80d499226d6bd3182d7221b35d64c1477e1ea61 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -951,13 +951,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
   }
 }
 
-#if 0
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-static char *mutt_gettext (const char *message)
-{
-  return (char *)message;
-}
-#endif

diff --git a/recvattach.c b/recvattach.c
index 99e165e570598dd56d7e2ea1c05c10363f6f362b..a65532b422390a796bc4eaae63ca5496397fc2e7 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -839,10 +839,6 @@ mutt_attach_display_loop (MUTTMENU *menu, int op, FILE *fp, HEADER *hdr,
                          int recv)
 {
   ATTACHPTR **idx = *idxp;
-#if 0
-  int old_optweed = option (OPTWEED);
-  set_option (OPTWEED);
-#endif
 
   do
   {
@@ -905,10 +901,6 @@ mutt_attach_display_loop (MUTTMENU *menu, int op, FILE *fp, HEADER *hdr,
   }
   while (op != OP_NULL);
 
-#if 0
-  if (option (OPTWEED) != old_optweed)
-    toggle_option (OPTWEED);
-#endif
   return op;
 }
 

diff --git a/regex.c b/regex.c
index 410fd84fc3921de8c4a588006960507b7173e217..16c8f2883036f3bc8f1ed29ea71b850539940731 100644 (file)
--- a/regex.c
+++ b/regex.c
@@ -38,15 +38,6 @@
  * the use of alloca.  So let's disable it for AIX.
  */
 
-#if 0
-
-/* AIX requires this to be the first thing in the file. */
-# if defined (_AIX) && !defined (REGEX_MALLOC)
-#  pragma alloca
-# endif
-
-#endif
-
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 
@@ -300,11 +291,6 @@ init_syntax_once ()
 #if HAVE_ALLOCA_H
 #include <alloca.h>
 #else /* not __GNUC__ or HAVE_ALLOCA_H */
-#if 0 /* It is a bad idea to declare alloca.  We always cast the result.  */
-#ifndef _AIX /* Already did AIX, up at the top.  */
-char *alloca ();
-#endif /* not _AIX */
-#endif
 #endif /* not HAVE_ALLOCA_H */
 #endif /* not __GNUC__ */
 
@@ -3652,15 +3638,6 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
            : (d) == string2 - 1 ? *(end1 - 1) : *(d))                  \
    == Sword)
 
-/* Disabled due to a compiler bug -- see comment at case wordbound */
-#if 0
-/* Test if the character before D and the one at D differ with respect
-   to being word-constituent.  */
-#define AT_WORD_BOUNDARY(d)                                            \
-  (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)                            \
-   || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
-#endif
-
 /* Free everything we malloc.  */
 #ifdef MATCH_MAY_ALLOCATE
 #define FREE_VAR(var) if (var) REGEX_FREE (var); var = NULL
@@ -4743,17 +4720,10 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
                   = *p2 == (unsigned char) endline ? '\n' : p2[2];
 #endif
 
-#if 0
-                if ((re_opcode_t) p1[3] == exactn
-                   && ! ((int) p2[1] * BYTEWIDTH > (int) p1[5]
-                         && (p2[2 + p1[5] / BYTEWIDTH]
-                             & (1 << (p1[5] % BYTEWIDTH)))))
-#else
                 if ((re_opcode_t) p1[3] == exactn
                    && ! ((int) p2[1] * BYTEWIDTH > (int) p1[4]
                          && (p2[2 + p1[4] / BYTEWIDTH]
                              & (1 << (p1[4] % BYTEWIDTH)))))
-#endif
                   {
                    p[-3] = (unsigned char) pop_failure_jump;
                     DEBUG_PRINT3 ("  %c != %c => pop_failure_jump.\n",
@@ -4954,24 +4924,6 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
             break;
           }
 
-#if 0
-       /* The DEC Alpha C compiler 3.x generates incorrect code for the
-          test  WORDCHAR_P (d - 1) != WORDCHAR_P (d)  in the expansion of
-          AT_WORD_BOUNDARY, so this code is disabled.  Expanding the
-          macro and introducing temporary variables works around the bug.  */
-
-       case wordbound:
-         DEBUG_PRINT1 ("EXECUTING wordbound.\n");
-         if (AT_WORD_BOUNDARY (d))
-           break;
-         goto fail;
-
-       case notwordbound:
-         DEBUG_PRINT1 ("EXECUTING notwordbound.\n");
-         if (AT_WORD_BOUNDARY (d))
-           goto fail;
-         break;
-#else
        case wordbound:
        {
          boolean prevchar, thischar;
@@ -5001,7 +4953,6 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
            goto fail;
          break;
        }
-#endif
 
        case wordbeg:
           DEBUG_PRINT1 ("EXECUTING wordbeg.\n");

diff --git a/rfc822.c b/rfc822.c
index b457db97f24ae97d7effab060928b7a152875f00..16748926e38672073dcbf42a66eff708d9484495 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -900,11 +900,7 @@ int main (int argc, char **argv)
 {
   ADDRESS *list;
   char buf[256];
-# if 0
-  char *str = "michael, Michael Elkins <me@mutt.org>, testing a really complex address: this example <@contains.a.source.route,@with.multiple.hosts:address@example.com>;, lothar@of.the.hillpeople (lothar)";
-# else
   char *str = "a b c ";
-# endif
 
   list = rfc822_parse_adrlist (NULL, str);
   buf[0] = 0;

diff --git a/sendlib.c b/sendlib.c
index 2663b1156df55ed68f44544ab931152caabb90fb..90fc58f0267ba5cc1db1e79e0459f61175a56557 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1195,10 +1195,6 @@ static void mutt_set_encoding (BODY *b, CONTENT *info)
   else if (b->type == TYPEAPPLICATION && ascii_strcasecmp (b->subtype, "pgp-keys") == 0)
     b->encoding = ENC7BIT;
   else
-#if 0
-    if (info->lobin || info->hibin || info->binary || info->linemax > 990
-          || info->cr || (/* option (OPTENCODEFROM) && */ info->from))
-#endif
   {
     /* Determine which encoding is smaller  */
     if (1.33 * (float)(info->lobin+info->hibin+info->ascii) <
@@ -1207,10 +1203,6 @@ static void mutt_set_encoding (BODY *b, CONTENT *info)
     else
       b->encoding = ENCQUOTEDPRINTABLE;
   }
-#if 0
-  else
-    b->encoding = ENC7BIT;
-#endif
 }
 
 void mutt_stamp_attachment(BODY *a)
@@ -1365,22 +1357,8 @@ BODY *mutt_make_file_attach (const char *path)
    * suffix.
    */
 
-#if 0
-
-  if ((n = mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf), path)) != TYPEOTHER
-      || *xbuf != '\0')
-  {
-    att->type = n;
-    att->subtype = safe_strdup (buf);
-    att->xtype = safe_strdup (xbuf);
-  }
-
-#else
-
   mutt_lookup_mime_type (att, path);
 
-#endif
-
   if ((info = mutt_get_content_info (path, att)) == NULL)
   {
     mutt_free_body (&att);

diff --git a/sha1.c b/sha1.c
index 9d336e281f8fbc640c8f25b39a57989235bf6640..0cfc61d08d30c0dfb8d389ef720a62720a168f1a 100644 (file)
--- a/sha1.c
+++ b/sha1.c
@@ -153,28 +153,11 @@ unsigned i;
 unsigned char finalcount[8];
 unsigned char c;
 
-#if 0  /* untested "improvement" by DHR */
-    /* Convert context->count to a sequence of bytes
-     * in finalcount.  Second element first, but
-     * big-endian order within element.
-     * But we do it all backwards.
-     */
-    unsigned char *fcp = &finalcount[8];
-
-    for (i = 0; i < 2; i++)
-    {
-       uint32_t t = context->count[i];
-       int j;
-
-       for (j = 0; j < 4; t >>= 8, j++)
-           *--fcp = (unsigned char) t
-    }
-#else
     for (i = 0; i < 8; i++) {
         finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
          >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
     }
-#endif
+
     c = 0200;
     SHA1Update(context, &c, 1);
     while ((context->count[0] & 504) != 448) {

diff --git a/strcasestr.c b/strcasestr.c
index 2f51ab8ee2bfc836fbc9bf65e08be68ba0afcae1..7cfe001415e59c4066770669dbfe8531f35ec86e 100644 (file)
--- a/strcasestr.c
+++ b/strcasestr.c
@@ -13,7 +13,6 @@ char *strcasestr(const char *s1, const char *s2)
         register const char *s = s1;
         register const char *p = s2;
 
-#if 1
         do {
                 if (!*p) {
                         return (char *) s1;;
@@ -31,19 +30,4 @@ char *strcasestr(const char *s1, const char *s2)
                         s = ++s1;
                 }
         } while (1);
-#else
-        while (*p && *s) {
-                if ((*p == *s)
-                        || (tolower(*((unsigned char *)p)) == tolower(*((unsigned char *)s)))
-                        ) {
-                        ++p;
-                        ++s;
-                } else {
-                        p = s2;
-                        s = ++s1;
-                }
-        }
-
-        return (*p) ? NULL : (char *) s1;
-#endif
 }

diff --git a/wcwidth.c b/wcwidth.c
index 0b494c79f7e9701a6f1fcf71a2af7b5c8ed0409d..5ff6e09c4d45b6e0074928c208c3bf19180d53a7 100644 (file)
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -167,17 +167,3 @@ int wcwidth_ucs(wchar_t ucs)
 
 #endif /* !HAVE_WC_FUNCS */
 
-#if 0 /* original */
-int wcswidth(const wchar_t *pwcs, size_t n)
-{
-  int w, width = 0;
-
-  for (;*pwcs && n-- > 0; pwcs++)
-    if ((w = wcwidth(*pwcs)) < 0)
-      return -1;
-    else
-      width += w;
-
-  return width;
-}
-#endif