Re: [PATCH] Remove unused functions from lib.c and muttlib.c.

--ffdckvlycndncpkc
Content-Type: text/plain; protected-headers=v1; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
From: Alejandro Colomar <[email protected]>
To: [email protected]
Subject: Re: [PATCH] Remove unused functions from lib.c and muttlib.c.
Message-ID: <alN9V9gFN5d8BNEK@devuan>
References: <[email protected]>
MIME-Version: 1.0
In-Reply-To: <[email protected]>

On 2026-07-12T13:18:47+0800, Kevin J. McCarthy wrote:
> I thought I had left more functions in lib.c after the conversion to
> BUFFERs, but I could only find these three functions that aren't used
> anymore: mutt_concat_path(), mutt_dup_header(), and
> mutt_display_sanitize().

Nice!


Cheers,
Alex

> ---
>  lib.c     | 13 -------------
>  lib.h     |  1 -
>  muttlib.c | 18 ------------------
>  protos.h  |  2 --
>  4 files changed, 34 deletions(-)
>=20
> diff --git a/lib.c b/lib.c
> index 649fdb3a..9776fcdb 100644
> --- a/lib.c
> +++ b/lib.c
> @@ -756,19 +756,6 @@ void mutt_remove_trailing_ascii_ws(char *s)
>      *p =3D 0;
>  }
> =20
> -char *mutt_concat_path(char *d, const char *dir, const char *fname, size=
_t l)
> -{
> -  const char *fmt =3D "%s/%s";
> -
> -  if (!*fname || (*dir && dir[strlen(dir)-1] =3D=3D '/'))
> -    fmt =3D "%s%s";
> -
> -  fname +=3D strspn(fname, "/");
> -
> -  snprintf(d, l, fmt, dir, fname);
> -  return d;
> -}
> -
>  const char *mutt_basename(const char *f)
>  {
>    const char *p =3D strrchr(f, '/');
> diff --git a/lib.h b/lib.h
> index 72e3a498..25875656 100644
> --- a/lib.h
> +++ b/lib.h
> @@ -203,7 +203,6 @@ void mutt_debug_f(const char *, const int, const char=
 *, const int err, const ch
> =20
>  /* The actual library functions. */
> =20
> -char *mutt_concat_path(char *, const char *, const char *, size_t);
>  char *mutt_read_line(char *, size_t *, FILE *, int *, int);
>  char *mutt_skip_ascii_ws(char *);
>  char *mutt_strlower(char *);
> diff --git a/muttlib.c b/muttlib.c
> index df882002..d24a37f0 100644
> --- a/muttlib.c
> +++ b/muttlib.c
> @@ -382,15 +382,6 @@ LIST *mutt_copy_list(LIST *p)
>    return (l);
>  }
> =20
> -HEADER *mutt_dup_header(HEADER *h)
> -{
> -  HEADER *hnew;
> -
> -  hnew =3D mutt_new_header();
> -  memcpy(hnew, h, sizeof(HEADER));
> -  return hnew;
> -}
> -
>  void mutt_free_header(HEADER **h)
>  {
>    if (!h || !*h) return;
> @@ -2150,15 +2141,6 @@ int state_putws(const wchar_t *ws, STATE *s)
>    return 0;
>  }
> =20
> -void mutt_display_sanitize(char *s)
> -{
> -  for (; *s; s++)
> -  {
> -    if (!IsPrint(*s))
> -      *s =3D '?';
> -  }
> -}
> -
>  void mutt_sleep(short s)
>  {
>    if (SleepTime > s)
> diff --git a/protos.h b/protos.h
> index 4958aa0e..7ea95ae5 100644
> --- a/protos.h
> +++ b/protos.h
> @@ -110,7 +110,6 @@ HASH *mutt_make_subj_hash(CONTEXT *);
> =20
>  char *mutt_read_rfc822_line(FILE *, char *, size_t *);
>  ENVELOPE *mutt_read_rfc822_header(FILE *, HEADER *, short, short);
> -HEADER *mutt_dup_header(HEADER *);
> =20
>  int mutt_check_month(const char *);
>  const char *mutt_ctime(const time_t *t);
> @@ -211,7 +210,6 @@ void mutt_decode_attachment(const BODY *, STATE *);
>  void mutt_decode_base64(STATE *s, LOFF_T len, int istext, iconv_t cd);
>  void mutt_default_save(char *, size_t, HEADER *);
>  void mutt_display_address(ENVELOPE *);
> -void mutt_display_sanitize(char *);
>  int mutt_edit_content_type(HEADER *, BODY *, FILE *);
>  void mutt_edit_file(const char *, const char *);
>  int mutt_edit_headers(const char *, SEND_CONTEXT *, int);
> --=20
> 2.55.0
>=20

--=20
<https://www.alejandro-colomar.es>

--ffdckvlycndncpkc
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEES7Jt9u9GbmlWADAi64mZXMKQwqkFAmpTfWYACgkQ64mZXMKQ
wqmUDQ//YWRZGN+H9n8VRaicURj+iI+iZeGa7fZN4SYWgowWD6sN7Aaii3BIN6RL
q5yeyLAVZKUw+79Bov9cXkGdatsm3yiZ0tAE4qvv1oEANKJlaRy7bj8IkgniaoFM
ZrtGEENT+T6yfSQgsIZpwQ+kj8ykArS6EgyIj6h/Xb0wIo2RnNuUnhwCnkhrc9cp
YpDV1CR9W337LIZUxVlj1V8Cgl0HvepTg9N2ZFPX6kj1iDcIFB9GY7s5sMxQ5BBv
ThizTrfvOqzCCK9afhHztnSLQDhUrZjLzNg+aHVYU0SCM8TY3X/qiCvXRSNYQrPn
aCfw+DxdTmV1TisIUs936LBy5qmHqvXYXoFOUIdW1xX8NmOLheu0KPLrfJII1qZj
XBlZXqPmePFSA20ANMD0hEg82QsRm/hb1erTfVEUSLt3C1SclHjHz+wLrTYOLEQ3
mUT7rojnA2TDEWHRPSGU1pXrZGYQ54+V0UwF63dudTyOjUVG+sAOZbKtpN4dgeUk
T2DYsh13fcZbfbIx4EC+6/m0QkSnZw4Qk2hRficXhMhU3LpM5MHUdEzWmKmEu7Xn
OJHNrKEP7APvvBybKwPVCreGmnSTOmAa3d3UR9gwDVVHyCVaojna93MHXWbKVU3Y
MLCZJ60iWwODPgY0u2nonk2hGVilxC0gLOL9rc1Zp8FICF4IkSg=
=Ioep
-----END PGP SIGNATURE-----

--ffdckvlycndncpkc--