Skip to content

Commit 932e347

Browse files
committed
revert GCC specific buffer borrow function and simplify character buffer assignment by using uintptr_t.
1 parent 908ee4c commit 932e347

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

src/bacnet/bacdcode.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
#include "bacnet/bacint.h"
1515
#include "bacnet/bacreal.h"
1616

17-
static char *bacnet_character_string_buffer_borrow(const char *value)
18-
{
19-
#if defined(__GNUC__)
20-
#pragma GCC diagnostic push
21-
#pragma GCC diagnostic ignored "-Wcast-qual"
22-
#endif
23-
return (char *)value;
24-
#if defined(__GNUC__)
25-
#pragma GCC diagnostic pop
26-
#endif
27-
}
28-
2917
/* max-segments-accepted
3018
B'000' Unspecified number of segments accepted.
3119
B'001' 2 segments accepted.
@@ -3421,8 +3409,7 @@ int bacnet_character_string_buffer_decode(
34213409
}
34223410
} else {
34233411
/* no buffer provided; use zero copy */
3424-
value->buffer =
3425-
bacnet_character_string_buffer_borrow((const char *)&apdu[1]);
3412+
value->buffer = (char *)(uintptr_t)&apdu[1];
34263413
value->buffer_size = string_length;
34273414
}
34283415
}

0 commit comments

Comments
 (0)