# HG changeset patch # User nicodvb # Date 1199014506 0 # Node ID 049808d4a560f84d51098dedcd51d203d725c6d7 # Parent e60fce5af518ecfcbfc55bda0c7cd192bfb805a4 define _SIZE macros as unsigned; part of ogle-1675 diff -r e60fce5af518 -r 049808d4a560 dvdread/ifo_types.h --- a/dvdread/ifo_types.h Tue Dec 04 23:03:58 2007 +0000 +++ b/dvdread/ifo_types.h Sun Dec 30 11:35:06 2007 +0000 @@ -68,7 +68,7 @@ typedef struct { uint8_t bytes[8]; } ATTRIBUTE_PACKED vm_cmd_t; -#define COMMAND_DATA_SIZE 8 +#define COMMAND_DATA_SIZE 8U /** @@ -266,7 +266,7 @@ vm_cmd_t *post_cmds; vm_cmd_t *cell_cmds; } ATTRIBUTE_PACKED pgc_command_tbl_t; -#define PGC_COMMAND_TBL_SIZE 8 +#define PGC_COMMAND_TBL_SIZE 8U /** * PGC Program Map @@ -419,7 +419,7 @@ cell_playback_t *cell_playback; cell_position_t *cell_position; } ATTRIBUTE_PACKED pgc_t; -#define PGC_SIZE 236 +#define PGC_SIZE 236U /** * Program Chain Information Search Pointer. @@ -439,7 +439,7 @@ uint32_t pgc_start_byte; pgc_t *pgc; } ATTRIBUTE_PACKED pgci_srp_t; -#define PGCI_SRP_SIZE 8 +#define PGCI_SRP_SIZE 8U /** * Program Chain Information Table. @@ -450,7 +450,7 @@ uint32_t last_byte; pgci_srp_t *pgci_srp; } ATTRIBUTE_PACKED pgcit_t; -#define PGCIT_SIZE 8 +#define PGCIT_SIZE 8U /** * Menu PGCI Language Unit. @@ -462,7 +462,7 @@ uint32_t lang_start_byte; pgcit_t *pgcit; } ATTRIBUTE_PACKED pgci_lu_t; -#define PGCI_LU_SIZE 8 +#define PGCI_LU_SIZE 8U /** * Menu PGCI Unit Table. @@ -473,7 +473,7 @@ uint32_t last_byte; pgci_lu_t *lu; } ATTRIBUTE_PACKED pgci_ut_t; -#define PGCI_UT_SIZE 8 +#define PGCI_UT_SIZE 8U /** * Cell Address Information. @@ -495,7 +495,7 @@ uint32_t last_byte; cell_adr_t *cell_adr_table; /* No explicit size given. */ } ATTRIBUTE_PACKED c_adt_t; -#define C_ADT_SIZE 8 +#define C_ADT_SIZE 8U /** * VOBU Address Map. @@ -504,7 +504,7 @@ uint32_t last_byte; uint32_t *vobu_start_sectors; } ATTRIBUTE_PACKED vobu_admap_t; -#define VOBU_ADMAP_SIZE 4 +#define VOBU_ADMAP_SIZE 4U @@ -602,7 +602,7 @@ uint32_t last_byte; title_info_t *title; } ATTRIBUTE_PACKED tt_srpt_t; -#define TT_SRPT_SIZE 8 +#define TT_SRPT_SIZE 8U /** @@ -621,7 +621,7 @@ uint16_t zero_2; pf_level_t *pf_ptl_mai; /* table of (nr_of_vtss + 1), video_ts is first */ } ATTRIBUTE_PACKED ptl_mait_country_t; -#define PTL_MAIT_COUNTRY_SIZE 8 +#define PTL_MAIT_COUNTRY_SIZE 8U /** * Parental Management Information Table. @@ -632,7 +632,7 @@ uint32_t last_byte; ptl_mait_country_t *countries; } ATTRIBUTE_PACKED ptl_mait_t; -#define PTL_MAIT_SIZE 8 +#define PTL_MAIT_SIZE 8U /** * Video Title Set Attributes. @@ -663,8 +663,8 @@ uint8_t nr_of_vtstt_subp_streams; subp_attr_t vtstt_subp_attr[32]; } ATTRIBUTE_PACKED vts_attributes_t; -#define VTS_ATTRIBUTES_SIZE 542 -#define VTS_ATTRIBUTES_MIN_SIZE 356 +#define VTS_ATTRIBUTES_SIZE 542U +#define VTS_ATTRIBUTES_MIN_SIZE 356U /** * Video Title Set Attribute Table. @@ -676,7 +676,7 @@ vts_attributes_t *vts; uint32_t *vts_atrt_offsets; /* offsets table for each vts_attributes */ } ATTRIBUTE_PACKED vts_atrt_t; -#define VTS_ATRT_SIZE 8 +#define VTS_ATRT_SIZE 8U /** * Text Data. (Incomplete) @@ -709,7 +709,7 @@ uint32_t txtdt_start_byte; /* prt, rel start of vmg_txtdt_mgi */ txtdt_t *txtdt; } ATTRIBUTE_PACKED txtdt_lu_t; -#define TXTDT_LU_SIZE 8 +#define TXTDT_LU_SIZE 8U /** * Text Data Manager Information. (Incomplete) @@ -720,7 +720,7 @@ uint32_t last_byte; txtdt_lu_t *lu; } ATTRIBUTE_PACKED txtdt_mgi_t; -#define TXTDT_MGI_SIZE 20 +#define TXTDT_MGI_SIZE 20U /** @@ -812,7 +812,7 @@ ttu_t *title; uint32_t *ttu_offset; /* offset table for each ttu */ } ATTRIBUTE_PACKED vts_ptt_srpt_t; -#define VTS_PTT_SRPT_SIZE 8 +#define VTS_PTT_SRPT_SIZE 8U /** @@ -830,7 +830,7 @@ uint16_t nr_of_entries; map_ent_t *map_ent; } ATTRIBUTE_PACKED vts_tmap_t; -#define VTS_TMAP_SIZE 4 +#define VTS_TMAP_SIZE 4U /** * Time Map Table. @@ -842,7 +842,7 @@ vts_tmap_t *tmap; uint32_t *tmap_offset; /* offset table for each tmap */ } ATTRIBUTE_PACKED vts_tmapt_t; -#define VTS_TMAPT_SIZE 8 +#define VTS_TMAPT_SIZE 8U #if PRAGMA_PACK