diff options
author | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-08-17 15:33:57 -0400 |
---|---|---|
committer | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-08-17 15:33:57 -0400 |
commit | 5a45b156d4165fed159a290c46676d1383ffcc80 (patch) | |
tree | 3689fb40b5b432140fd48822973b760af93080a6 /src/ipaccess/ipaccess-firmware.c | |
parent | 03fd8d014f9871896a86534432c8757d65a576fe (diff) |
New upstream version 0.9.14upstream/0.9.14
Diffstat (limited to 'src/ipaccess/ipaccess-firmware.c')
-rw-r--r-- | src/ipaccess/ipaccess-firmware.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ipaccess/ipaccess-firmware.c b/src/ipaccess/ipaccess-firmware.c index 7fdd0f825..6d391075c 100644 --- a/src/ipaccess/ipaccess-firmware.c +++ b/src/ipaccess/ipaccess-firmware.c @@ -20,7 +20,7 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <stdio.h> #include <stdlib.h> @@ -29,8 +29,8 @@ #define PART_LENGTH 138 -static_assert(sizeof(struct sdp_header_entry) == 138, right_entry); -static_assert(sizeof(struct sdp_firmware) == 158, _right_header_length); +osmo_static_assert(sizeof(struct sdp_header_entry) == 138, right_entry); +osmo_static_assert(sizeof(struct sdp_firmware) == 158, _right_header_length); /* more magic, the second "int" in the header */ static char more_magic[] = { 0x10, 0x02 }; @@ -41,8 +41,8 @@ int ipaccess_analyze_file(int fd, const unsigned int st_size, const unsigned int struct sdp_header *header; char buf[4096]; int rc, i; - u_int16_t table_size; - u_int16_t table_offset; + uint16_t table_size; + uint16_t table_offset; off_t table_start; |