giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #623 from flaviommedeiros/master 

Avoiding conditional directives that split up parts of statements.
This commit is contained in:
Frank Morgner 2015-11-30 00:43:53 +01:00
parent 7a2858d7a6 b9adbae5f0
commit 83ed69e46a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libopensc/ctx.c
View File

@ -322,7 +322,7 @@ static void load_reader_driver_options(sc_context_t *ctx)
*/ */
static const char *find_library(sc_context_t *ctx, const char *name) static const char *find_library(sc_context_t *ctx, const char *name)
{ {
int i; int i, log_warning;
const char *libname = NULL; const char *libname = NULL;
scconf_block **blocks, *blk; scconf_block **blocks, *blk;
@ -336,10 +336,11 @@ static const char *find_library(sc_context_t *ctx, const char *name)
continue; continue;
libname = scconf_get_str(blk, "module", name); libname = scconf_get_str(blk, "module", name);
#ifdef _WIN32 #ifdef _WIN32
if (libname && libname[0] != '\\' ) log_warning = libname && libname[0] != ‘\\';
#else #else
if (libname && libname[0] != '/' ) log_warning = libname && libname[0] != ‘/‘;
#endif #endif
if (log_warning)
sc_log(ctx, "warning: relative path to driver '%s' used", libname); sc_log(ctx, "warning: relative path to driver '%s' used", libname);
break; break;
} }
@ -917,7 +918,7 @@ int sc_get_cache_dir(sc_context_t *ctx, char *buf, size_t bufsize)
int sc_make_cache_dir(sc_context_t *ctx) int sc_make_cache_dir(sc_context_t *ctx)
{ {
char dirname[PATH_MAX], *sp; char dirname[PATH_MAX], *sp;
int r; int r, mkdir_checker;
size_t j, namelen; size_t j, namelen;
if ((r = sc_get_cache_dir(ctx, dirname, sizeof(dirname))) < 0) if ((r = sc_get_cache_dir(ctx, dirname, sizeof(dirname))) < 0)
@ -926,10 +927,11 @@ int sc_make_cache_dir(sc_context_t *ctx)
while (1) { while (1) {
#ifdef _WIN32 #ifdef _WIN32
if (mkdir(dirname) >= 0) mkdir_checker = mkdir(dirname) >= 0;
#else #else
if (mkdir(dirname, 0700) >= 0) mkdir_checker = mkdir(dirname, 0700) >= 0;
#endif #endif
if (mkdir_checker)
break; break;
if (errno != ENOENT || (sp = strrchr(dirname, '/')) == NULL if (errno != ENOENT || (sp = strrchr(dirname, '/')) == NULL
@ -946,10 +948,11 @@ int sc_make_cache_dir(sc_context_t *ctx)
break; break;
dirname[j] = '/'; dirname[j] = '/';
#ifdef _WIN32 #ifdef _WIN32
if (mkdir(dirname) < 0) mkdir_checker = mkdir(dirname) < 0;
#else #else
if (mkdir(dirname, 0700) < 0) mkdir_checker = mkdir(dirname, 0700) < 0;
#endif #endif
if (mkdir_checker)
goto failed; goto failed;
} }
return SC_SUCCESS; return SC_SUCCESS;