# HG changeset patch # User jcdutton # Date 1072969759 0 # Node ID 993dc61d2c4f9b851d18fe843a0eff6e44ee1e37 # Parent a4b525fd1df655c31ac8eb8169c8e5545ed7fb81 Include vmcmd.c in all libdvdnav builds, so tools like ifodump work without having to include their own versions. Fix a few types. diff -r a4b525fd1df6 -r 993dc61d2c4f vmcmd.c --- a/vmcmd.c Wed Dec 31 21:50:05 2003 +0000 +++ b/vmcmd.c Thu Jan 01 15:09:19 2004 +0000 @@ -33,9 +33,6 @@ #include "dvdnav_internal.h" - -#ifdef TRACE - /* freebsd compatibility */ #ifndef PRIu8 #define PRIu8 "d" @@ -152,7 +149,7 @@ static void print_reg_or_data(command_t* command, int immediate, int start) { if(immediate) { - int i = vm_getbits(command, start, 16); + uint32_t i = vm_getbits(command, start, 16); fprintf(MSG_OUT, "0x%x", i); if(isprint(i & 0xff) && isprint((i>>8) & 0xff)) @@ -171,7 +168,7 @@ static void print_reg_or_data_3(command_t* command, int immediate, int start) { if(immediate) { - int i = vm_getbits(command, start, 16); + uint32_t i = vm_getbits(command, start, 16); fprintf(MSG_OUT, "0x%x", i); if(isprint(i & 0xff) && isprint((i>>8) & 0xff)) @@ -275,8 +272,8 @@ } static void print_linksub_instruction(command_t* command) { - int linkop = vm_getbits(command, 7, 8); - int button = vm_getbits(command, 15, 6); + uint32_t linkop = vm_getbits(command, 7, 8); + uint32_t button = vm_getbits(command, 15, 6); if(linkop < sizeof(link_table)/sizeof(char *) && link_table[linkop] != NULL) fprintf(MSG_OUT, "%s (button %" PRIu8 ")", link_table[linkop], button); @@ -540,4 +537,3 @@ fprintf(MSG_OUT, "\n"); } -#endif