Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3289 gss: Interface and code changes for shared key
[fs/lustre-release.git]
/
lustre
/
utils
/
gss
/
err_util.c
diff --git
a/lustre/utils/gss/err_util.c
b/lustre/utils/gss/err_util.c
index
376fb59
..
76a172f
100644
(file)
--- a/
lustre/utils/gss/err_util.c
+++ b/
lustre/utils/gss/err_util.c
@@
-81,7
+81,8
@@
void printerr(int priority, char *format, ...)
strcat(message_buf, "...\n");
goto printit;
}
strcat(message_buf, "...\n");
goto printit;
}
- if (message_buf[strlen(message_buf) - 1] == '\n')
+ buf_used = strlen(message_buf);
+ if (buf_used > 0 && message_buf[buf_used - 1] == '\n')
goto printit;
return;
printit:
goto printit;
return;
printit:
@@
-96,22
+97,26
@@
printit:
void print_hexl(int pri, unsigned char *cp, int length)
{
void print_hexl(int pri, unsigned char *cp, int length)
{
- int i, j, jm;
- unsigned char c;
-
printerr(pri, "length %d\n",length);
printerr(pri, "\n");
printerr(pri, "length %d\n",length);
printerr(pri, "\n");
+ print_hex(pri, cp, length);
+}
+
+void print_hex(int pri, unsigned char *cp, int length)
+{
+ int i, j, jm;
+ unsigned char c;
for (i = 0; i < length; i += 0x10) {
for (i = 0; i < length; i += 0x10) {
- printerr(pri, " %04x: ", (u
_
int)i);
+ printerr(pri, " %04x: ", (u
nsigned
int)i);
jm = length - i;
jm = jm > 16 ? 16 : jm;
for (j = 0; j < jm; j++) {
if ((j % 2) == 1)
jm = length - i;
jm = jm > 16 ? 16 : jm;
for (j = 0; j < jm; j++) {
if ((j % 2) == 1)
- printerr(pri,
"%02x ", (u_
int)cp[i+j]);
+ printerr(pri,
"%02x ", (unsigned
int)cp[i+j]);
else
else
- printerr(pri,
"%02x", (u_
int)cp[i+j]);
+ printerr(pri,
"%02x", (unsigned
int)cp[i+j]);
}
for (; j < 16; j++) {
if ((j % 2) == 1)
}
for (; j < 16; j++) {
if ((j % 2) == 1)