[pkg-opensc-commit] [opensc] 65/295: Get rid of misleading indentation warnings (GCC6 -Wmisleading-indentation) (#859)
Eric Dorland
eric at moszumanska.debian.org
Sat Jun 24 21:11:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository opensc.
commit 952fb7cb93199b50e82302a80d4f2dbdd716d0dd
Author: Jakuje <jakuje at gmail.com>
Date: Sat Aug 27 23:19:52 2016 +0200
Get rid of misleading indentation warnings (GCC6 -Wmisleading-indentation) (#859)
---
src/libopensc/log.c | 20 ++++++++++----------
src/tools/netkey-tool.c | 4 +++-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/libopensc/log.c b/src/libopensc/log.c
index 86463d7..9c6f8a1 100644
--- a/src/libopensc/log.c
+++ b/src/libopensc/log.c
@@ -169,16 +169,16 @@ void _sc_debug_hex(sc_context_t *ctx, int type, const char *file, int line,
if (buf == NULL)
return;
- sc_hex_dump(ctx, type, data, len, buf, blen);
-
- if (label)
- sc_do_log(ctx, type, file, line, func,
- "\n%s (%u byte%s):\n%s",
- label, (unsigned int) len, len==1?"":"s", buf);
- else
- sc_do_log(ctx, type, file, line, func,
- "%u byte%s:\n%s",
- (unsigned int) len, len==1?"":"s", buf);
+ sc_hex_dump(ctx, type, data, len, buf, blen);
+
+ if (label)
+ sc_do_log(ctx, type, file, line, func,
+ "\n%s (%u byte%s):\n%s",
+ label, (unsigned int) len, len==1?"":"s", buf);
+ else
+ sc_do_log(ctx, type, file, line, func,
+ "%u byte%s:\n%s",
+ (unsigned int) len, len==1?"":"s", buf);
free(buf);
}
diff --git a/src/tools/netkey-tool.c b/src/tools/netkey-tool.c
index 59f55f3..6aef644 100644
--- a/src/tools/netkey-tool.c
+++ b/src/tools/netkey-tool.c
@@ -558,7 +558,9 @@ int main(
exit(1);
}
printf("\nCard detected (driver: %s)\nATR:", card->driver->name);
- for(i=0;i<card->atr.len;++i) printf("%c%02X", i?':':' ', card->atr.value[i]); printf("\n");
+ for (i = 0; i < card->atr.len; ++i)
+ printf("%c%02X", i?':':' ', card->atr.value[i]);
+ printf("\n");
if((r = sc_lock(card))<0){
fprintf(stderr,"Lock failed: %s\n", sc_strerror(r));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git
More information about the pkg-opensc-commit
mailing list