Commit b7573c59 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove dead code from crypto 



Some miscellaneous removal of dead code from lib crypto.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent e4676e90

crypto/bio/b_print.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -592,7 +592,6 @@ fmtfp(char **sbuffer, 
    int fplace = 0;

    int fplace = 0;

    int padlen = 0;

    int padlen = 0;

    int zpadlen = 0;

    int zpadlen = 0;

    int caps = 0;

    long intpart;

    long intpart;

    long fracpart;

    long fracpart;

    long max10;

    long max10;
@@ -630,8 +629,7 @@ fmtfp(char **sbuffer, 




    /* convert integer part */

    /* convert integer part */

    do {

    do {

        iconvert[iplace++] =

        iconvert[iplace++] = "0123456789"[intpart % 10];

            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[intpart % 10];

        intpart = (intpart / 10);

        intpart = (intpart / 10);

    } while (intpart && (iplace < (int)sizeof(iconvert)));

    } while (intpart && (iplace < (int)sizeof(iconvert)));

    if (iplace == sizeof iconvert)

    if (iplace == sizeof iconvert)
@@ -640,8 +638,7 @@ fmtfp(char **sbuffer, 




    /* convert fractional part */

    /* convert fractional part */

    do {

    do {

        fconvert[fplace++] =

        fconvert[fplace++] = "0123456789"[fracpart % 10];

            (caps ? "0123456789ABCDEF" : "0123456789abcdef")[fracpart % 10];

        fracpart = (fracpart / 10);

        fracpart = (fracpart / 10);

    } while (fplace < max);

    } while (fplace < max);

    if (fplace == sizeof fconvert)

    if (fplace == sizeof fconvert)

crypto/dso/dso_dlfcn.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, 
            return (NULL);

            return (NULL);

        }

        }

        strcpy(merged, filespec2);

        strcpy(merged, filespec2);

    } else

    } else {

        /*

        /*

         * This part isn't as trivial as it looks.  It assumes that the

         * This part isn't as trivial as it looks.  It assumes that the

         * second file specification really is a directory, and makes no

         * second file specification really is a directory, and makes no
@@ -307,13 +307,12 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, 
         * concatenation of filespec2 followed by a slash followed by

         * concatenation of filespec2 followed by a slash followed by

         * filespec1.

         * filespec1.

         */

         */

    {

        int spec2len, len;

        int spec2len, len;





        spec2len = strlen(filespec2);

        spec2len = strlen(filespec2);

        len = spec2len + (filespec1 ? strlen(filespec1) : 0);

        len = spec2len + strlen(filespec1);





        if (filespec2 && filespec2[spec2len - 1] == '/') {

        if (spec2len && filespec2[spec2len - 1] == '/') {

            spec2len--;

            spec2len--;

            len--;

            len--;

        }

        }