bos: Change to using char casts for ka functions

The ka_IsZero and ka_PrintBytes function just use char strings. Cast
directly, rather than going via a helper functions to simplify this
code.

The helper functions add complexity, and additional dependencies which
cause problems with some uses of this code.

Reviewed-on: http://gerrit.openafs.org/7066
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 46c5aabfc6f5af2875e8b20252a17955ad89dd38)

Change-Id: Ifee3178e5cdc2eab947f759541864ecea4345b7a
Reviewed-on: http://gerrit.openafs.org/10867
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index 47490faa0b6e8e7a5b631226c11d226222572f4f..930604987ba8dd043e934d4ef67ad1ba19351d4c 100644 (file)
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -870,9 +870,10 @@ ListKeys(struct cmd_syndesc *as, void *arock)
            break;
        everWorked = 1;
        /* first check if key is returned */
-       if ((!ka_KeyIsZero(ktc_to_charptr(&tkey), sizeof(tkey))) && (as->parms[1].items)) {
+       if ((!ka_KeyIsZero((char *)&tkey, sizeof(tkey)))
+           && (as->parms[1].items)) {
            printf("key %d is '", kvno);
-           ka_PrintBytes(ktc_to_charptr(&tkey), sizeof(tkey));
+           ka_PrintBytes((char *)&tkey, sizeof(tkey));
            printf("'\n");
        } else {
            if (keyInfo.keyCheckSum == 0)       /* shouldn't happen */

diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c
index 8c51fa40391959e87f9c76dd9f0a83ad734e6087..391d17fe02a7c271c82ea66d06745c59fe99360e 100644 (file)
--- a/src/bozo/bos_util.c
+++ b/src/bozo/bos_util.c
@@ -91,7 +91,7 @@ main(int argc, char **argv)
            exit(1);
        }
        ka_StringToKey(buf, tcell, &tkey);
-       code = afsconf_AddKey(tdir, kvno, ktc_to_charptr(&tkey), 0);
+       code = afsconf_AddKey(tdir, kvno, (char *)&tkey, 0);
        if (code) {
            printf("bos_util: failed to set key, code %d.\n", code);
            exit(1);