63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
|
From 86b8f475811a20a477801a50eada3b43fb3129ea Mon Sep 17 00:00:00 2001
|
||
|
|
From: caodongxia <315816521@qq.com>
|
||
|
|
Date: Wed, 2 Jun 2021 19:18:22 +0800
|
||
|
|
Subject: [PATCH] create patch
|
||
|
|
|
||
|
|
---
|
||
|
|
tsk/base/tsk_base_i.h | 24 ++++++++++++------------
|
||
|
|
1 file changed, 12 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tsk/base/tsk_base_i.h b/tsk/base/tsk_base_i.h
|
||
|
|
index 147ef13..de86b32 100644
|
||
|
|
--- a/tsk/base/tsk_base_i.h
|
||
|
|
+++ b/tsk/base/tsk_base_i.h
|
||
|
|
@@ -79,8 +79,8 @@ extern "C" {
|
||
|
|
*/
|
||
|
|
#define tsk_getu16(endian, x) \
|
||
|
|
(uint16_t)(((endian) == TSK_LIT_ENDIAN) ? \
|
||
|
|
- (((uint8_t *)(x))[0] + (((uint8_t *)(x))[1] << 8)) : \
|
||
|
|
- (((uint8_t *)(x))[1] + (((uint8_t *)(x))[0] << 8)) )
|
||
|
|
+ (((uint8_t *)(x))[0] + ((unsigned int)(((uint8_t *)(x))[1]) << 8)) : \
|
||
|
|
+ (((uint8_t *)(x))[1] + ((unsigned int)(((uint8_t *)(x))[0]) << 8)) )
|
||
|
|
|
||
|
|
/** \internal
|
||
|
|
* Read a 16-bit signed value.
|
||
|
|
@@ -99,8 +99,8 @@ extern "C" {
|
||
|
|
*/
|
||
|
|
#define tsk_getu24(endian, x) \
|
||
|
|
(uint32_t)(((endian) == TSK_LIT_ENDIAN) ? \
|
||
|
|
- (((uint8_t *)(x))[0] + (((uint8_t *)(x))[1] << 8) + (((uint8_t *)(x))[2] << 16)) : \
|
||
|
|
- (((uint8_t *)(x))[2] + (((uint8_t *)(x))[1] << 8) + (((uint8_t *)(x))[0] << 16)) )
|
||
|
|
+ (((uint8_t *)(x))[0] + ((unsigned int)(((uint8_t *)(x))[1]) << 8) + ((unsigned int)(((uint8_t *)(x))[2]) << 16)) : \
|
||
|
|
+ (((uint8_t *)(x))[2] + ((unsigned int)(((uint8_t *)(x))[1]) << 8) + ((unsigned int)(((uint8_t *)(x))[0]) << 16)) )
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
@@ -112,15 +112,15 @@ extern "C" {
|
||
|
|
*/
|
||
|
|
#define tsk_getu32(endian, x) \
|
||
|
|
(uint32_t)( ((endian) == TSK_LIT_ENDIAN) ? \
|
||
|
|
- ((((uint8_t *)(x))[0] << 0) + \
|
||
|
|
- (((uint8_t *)(x))[1] << 8) + \
|
||
|
|
- (((uint8_t *)(x))[2] << 16) + \
|
||
|
|
- (((uint8_t *)(x))[3] << 24) ) \
|
||
|
|
+ (((unsigned int)(((uint8_t *)(x))[0]) << 0) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[1]) << 8) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[2]) << 16) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[3]) << 24) ) \
|
||
|
|
: \
|
||
|
|
- ((((uint8_t *)(x))[3] << 0) + \
|
||
|
|
- (((uint8_t *)(x))[2] << 8) + \
|
||
|
|
- (((uint8_t *)(x))[1] << 16) + \
|
||
|
|
- (((uint8_t *)(x))[0] << 24) ) )
|
||
|
|
+ (((unsigned int)(((uint8_t *)(x))[3]) << 0) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[2]) << 8) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[1]) << 16) + \
|
||
|
|
+ ((unsigned int)(((uint8_t *)(x))[0]) << 24) ) )
|
||
|
|
|
||
|
|
/** \internal
|
||
|
|
* Read a 32-bit signed value.
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|