Skip to content

Commit 5ce38a9

Browse files
authored
Changes to support gcc 15 (#111)
1 parent 6eca242 commit 5ce38a9

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed

class_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
DEBUG = 0
236236

237237
# The pytsk3 version.
238-
VERSION = "20250729"
238+
VERSION = "20250801"
239239

240240
# These functions are used to manage library memory.
241241
FREE = "aff4_free"

dpkg/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pytsk3 (20250729-1) unstable; urgency=low
1+
pytsk3 (20250801-1) unstable; urgency=low
22

33
* Auto-generated
44

5-
-- Joachim Metz <[email protected]> Tue, 29 Jul 2025 07:05:03 -0100
5+
-- Joachim Metz <[email protected]> Fri, 01 Aug 2025 07:51:42 -0100

patches/sleuthkit-4.14.0-crc.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/tsk/base/crc.h b/tsk/base/crc.h
2+
index f9f4617c3..f73426c36 100644
3+
--- a/tsk/base/crc.h
4+
+++ b/tsk/base/crc.h
5+
@@ -91,7 +91,7 @@ Status : Copyright (C) Ross Williams, 1993. However, permission is
6+
#ifndef DONE_STYLE
7+
8+
typedef unsigned long ulong;
9+
-typedef unsigned bool;
10+
+typedef unsigned crc_bool;
11+
typedef unsigned char * p_ubyte_;
12+
13+
#ifndef TRUE
14+
@@ -120,8 +120,8 @@ typedef struct
15+
int cm_width; /* Parameter: Width in bits [8,32]. */
16+
ulong cm_poly; /* Parameter: The algorithm's polynomial. */
17+
ulong cm_init; /* Parameter: Initial register value. */
18+
- bool cm_refin; /* Parameter: Reflect input bytes? */
19+
- bool cm_refot; /* Parameter: Reflect output CRC? */
20+
+ crc_bool cm_refin; /* Parameter: Reflect input bytes? */
21+
+ crc_bool cm_refot; /* Parameter: Reflect output CRC? */
22+
ulong cm_xorot; /* Parameter: XOR this to output CRC. */
23+
24+
ulong cm_reg; /* Context: Context during execution. */

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = pytsk3
3-
version = 20250729
3+
version = 20250801
44
description = Python bindings for the SleuthKit
55
long_description = Python bindings for the SleuthKit
66
author = Michael Cohen

talloc/replace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define _PUBLIC_ extern
1313

14-
typedef int bool;
14+
typedef int talloc_bool;
1515

1616
#define true 1
1717
#define false 0

talloc/talloc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ static void *autofree_context;
120120
* catching use after free errors when valgrind is too slow
121121
*/
122122
static struct {
123-
bool initialised;
124-
bool enabled;
123+
talloc_bool initialised;
124+
talloc_bool enabled;
125125
uint8_t fill_value;
126126
} talloc_fill;
127127

@@ -237,7 +237,7 @@ struct talloc_memlimit {
237237
size_t cur_size;
238238
};
239239

240-
static bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size);
240+
static talloc_bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size);
241241
static void talloc_memlimit_grow(struct talloc_memlimit *limit,
242242
size_t size);
243243
static void talloc_memlimit_shrink(struct talloc_memlimit *limit,
@@ -1582,7 +1582,7 @@ _PUBLIC_ void *_talloc_realloc(const void *context, void *ptr, size_t size, cons
15821582
{
15831583
struct talloc_chunk *tc;
15841584
void *new_ptr;
1585-
bool malloced = false;
1585+
talloc_bool malloced = false;
15861586
struct talloc_pool_hdr *pool_hdr = NULL;
15871587
size_t old_size = 0;
15881588
size_t new_size = 0;
@@ -2672,7 +2672,7 @@ static size_t _talloc_total_limit_size(const void *ptr,
26722672
old_limit, new_limit);
26732673
}
26742674

2675-
static bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size)
2675+
static talloc_bool talloc_memlimit_check(struct talloc_memlimit *limit, size_t size)
26762676
{
26772677
struct talloc_memlimit *l;
26782678

0 commit comments

Comments
 (0)