summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/rpm.c16
-rw-r--r--archival/rpm2cpio.c18
2 files changed, 17 insertions, 17 deletions
diff --git a/archival/rpm.c b/archival/rpm.c
index e3f20ca..eb2c043 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -82,10 +82,10 @@ enum rpm_functions_e {
};
typedef struct {
- u_int32_t tag; /* 4 byte tag */
- u_int32_t type; /* 4 byte type */
- u_int32_t offset; /* 4 byte offset */
- u_int32_t count; /* 4 byte count */
+ uint32_t tag; /* 4 byte tag */
+ uint32_t type; /* 4 byte type */
+ uint32_t offset; /* 4 byte offset */
+ uint32_t count; /* 4 byte count */
} rpm_index;
static void *map;
@@ -227,10 +227,10 @@ rpm_index **rpm_gettags(int fd, int *num_tags)
for (pass = 0; pass < 2; pass++) { /* 1st pass is the signature headers, 2nd is the main stuff */
struct {
char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
- u_int8_t version; /* 1 byte version number */
- u_int32_t reserved; /* 4 bytes reserved */
- u_int32_t entries; /* Number of entries in header (4 bytes) */
- u_int32_t size; /* Size of store (4 bytes) */
+ uint8_t version; /* 1 byte version number */
+ uint32_t reserved; /* 4 bytes reserved */
+ uint32_t entries; /* Number of entries in header (4 bytes) */
+ uint32_t size; /* Size of store (4 bytes) */
} header;
rpm_index *tmpindex;
int storepos;
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 47f4e73..d0041a8 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -31,21 +31,21 @@
struct rpm_lead {
unsigned char magic[4];
- u_int8_t major, minor;
- u_int16_t type;
- u_int16_t archnum;
+ uint8_t major, minor;
+ uint16_t type;
+ uint16_t archnum;
char name[66];
- u_int16_t osnum;
- u_int16_t signature_type;
+ uint16_t osnum;
+ uint16_t signature_type;
char reserved[16];
};
struct rpm_header {
char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
- u_int8_t version; /* 1 byte version number */
- u_int32_t reserved; /* 4 bytes reserved */
- u_int32_t entries; /* Number of entries in header (4 bytes) */
- u_int32_t size; /* Size of store (4 bytes) */
+ uint8_t version; /* 1 byte version number */
+ uint32_t reserved; /* 4 bytes reserved */
+ uint32_t entries; /* Number of entries in header (4 bytes) */
+ uint32_t size; /* Size of store (4 bytes) */
};
void skip_header(int rpm_fd)