From b7573c597c1932ef709b2455ffab47348b5c54e5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 12 Mar 2015 14:08:21 +0000 Subject: Remove dead code from crypto Some miscellaneous removal of dead code from lib crypto. Reviewed-by: Richard Levitte --- crypto/dso/dso_dlfcn.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crypto/dso') diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index c9a9a8bbb0..8ebb2b59c9 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -299,7 +299,7 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, return (NULL); } strcpy(merged, filespec2); - } else + } else { /* * This part isn't as trivial as it looks. It assumes that the * 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 * filespec1. */ - { int spec2len, len; spec2len = strlen(filespec2); - len = spec2len + (filespec1 ? strlen(filespec1) : 0); + len = spec2len + strlen(filespec1); - if (filespec2 && filespec2[spec2len - 1] == '/') { + if (spec2len && filespec2[spec2len - 1] == '/') { spec2len--; len--; } -- cgit v1.2.3