Illumos #1884, #3028, #3048, #3049, #3060, #3061, #3093

[zfs.git] / cmd / zdb / zdb_il.c

diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c
index a0ed985..bc167ce 100644 (file)
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2012 Cyril Plisko. All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -172,7 +173,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
                if (isprint(*data))
                        (void) printf("%c ", *data);
                else
-                       (void) printf("%2X", *data);
+                       (void) printf("%2hhX", *data);
                data++;
        }
        (void) printf("\n");
@@ -240,7 +241,7 @@ zil_prt_rec_acl(zilog_t *zilog, int txtype, lr_acl_t *lr)
            (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
 }
 
-typedef void (*zil_prt_rec_func_t)();
+typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *);
 typedef struct zil_rec_info {
        zil_prt_rec_func_t      zri_print;
        char                    *zri_name;
@@ -248,27 +249,27 @@ typedef struct zil_rec_info {
 } zil_rec_info_t;
 
 static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
-       {       NULL,                   "Total              " },
-       {       zil_prt_rec_create,     "TX_CREATE          " },
-       {       zil_prt_rec_create,     "TX_MKDIR           " },
-       {       zil_prt_rec_create,     "TX_MKXATTR         " },
-       {       zil_prt_rec_create,     "TX_SYMLINK         " },
-       {       zil_prt_rec_remove,     "TX_REMOVE          " },
-       {       zil_prt_rec_remove,     "TX_RMDIR           " },
-       {       zil_prt_rec_link,       "TX_LINK            " },
-       {       zil_prt_rec_rename,     "TX_RENAME          " },
-       {       zil_prt_rec_write,      "TX_WRITE           " },
-       {       zil_prt_rec_truncate,   "TX_TRUNCATE        " },
-       {       zil_prt_rec_setattr,    "TX_SETATTR         " },
-       {       zil_prt_rec_acl,        "TX_ACL_V0          " },
-       {       zil_prt_rec_acl,        "TX_ACL_ACL         " },
-       {       zil_prt_rec_create,     "TX_CREATE_ACL      " },
-       {       zil_prt_rec_create,     "TX_CREATE_ATTR     " },
-       {       zil_prt_rec_create,     "TX_CREATE_ACL_ATTR " },
-       {       zil_prt_rec_create,     "TX_MKDIR_ACL       " },
-       {       zil_prt_rec_create,     "TX_MKDIR_ATTR      " },
-       {       zil_prt_rec_create,     "TX_MKDIR_ACL_ATTR  " },
-       {       zil_prt_rec_write,      "TX_WRITE2          " },
+       { NULL,                 "Total              " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_CREATE          " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_MKDIR           " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_MKXATTR         " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_SYMLINK         " },
+       { (zil_prt_rec_func_t)zil_prt_rec_remove,       "TX_REMOVE          " },
+       { (zil_prt_rec_func_t)zil_prt_rec_remove,       "TX_RMDIR           " },
+       { (zil_prt_rec_func_t)zil_prt_rec_link,         "TX_LINK            " },
+       { (zil_prt_rec_func_t)zil_prt_rec_rename,       "TX_RENAME          " },
+       { (zil_prt_rec_func_t)zil_prt_rec_write,        "TX_WRITE           " },
+       { (zil_prt_rec_func_t)zil_prt_rec_truncate,     "TX_TRUNCATE        " },
+       { (zil_prt_rec_func_t)zil_prt_rec_setattr,      "TX_SETATTR         " },
+       { (zil_prt_rec_func_t)zil_prt_rec_acl,          "TX_ACL_V0          " },
+       { (zil_prt_rec_func_t)zil_prt_rec_acl,          "TX_ACL_ACL         " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_CREATE_ACL      " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_CREATE_ATTR     " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_CREATE_ACL_ATTR " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_MKDIR_ACL       " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_MKDIR_ATTR      " },
+       { (zil_prt_rec_func_t)zil_prt_rec_create,       "TX_MKDIR_ACL_ATTR  " },
+       { (zil_prt_rec_func_t)zil_prt_rec_write,        "TX_WRITE2          " },
 };
 
 /* ARGSUSED */