Remove SIZEOF_VOIDP and ENVIRONMENT{32,64} macros. (#12046)
vkalintiris committed
Feb 22, 2022 at 14:24 UTC
1ce39d11f4d1a4c1dd5d9d46727586b795bbbae5
3 files changed
+26
-25
configure.ac
-1
@@ -262,7 +262,6 @@ AC_FUNC_STRERROR_R
262
AC_C__GENERIC
263
AC_C___ATOMIC
264
# AC_C_STMT_EXPR
265
-AC_CHECK_SIZEOF([void *])
265
AC_CANONICAL_HOST
266
AC_HEADER_MAJOR
267
AC_HEADER_RESOLV
libnetdata/buffer/buffer.c
+26
-16
@@ -87,14 +87,19 @@ inline char *print_number_llu_r(char *str, unsigned long long uvalue) {
87
}
88
89
inline char *print_number_llu_r_smart(char *str, unsigned long long uvalue) {
90
-#ifdef ENVIRONMENT32
91
- if(uvalue > (unsigned long long)0xffffffff)
92
- str = print_number_llu_r(str, uvalue);
93
- else
94
- str = print_number_lu_r(str, uvalue);
95
-#else
96
- do *str++ = (char)('0' + (uvalue % 10)); while(uvalue /= 10);
97
-#endif
90
+ switch (sizeof(void *)) {
91
+ case 4:
92
+ str = (uvalue > (unsigned long long) 0xffffffff) ? print_number_llu_r(str, uvalue) :
93
+ print_number_lu_r(str, uvalue);
94
+ break;
95
+ case 8:
96
+ do {
97
+ *str++ = (char) ('0' + (uvalue % 10));
98
+ } while (uvalue /= 10);
99
+ break;
100
+ default:
101
+ fatal("Netdata supports only 32-bit & 64-bit systems.");
102
+ }
103
104
return str;
105
}
@@ -106,14 +111,19 @@ void buffer_print_llu(BUFFER *wb, unsigned long long uvalue)
111
char *str = &wb->buffer[wb->len];
112
char *wstr = str;
113
109
-#ifdef ENVIRONMENT32
110
- if(uvalue > (unsigned long long)0xffffffff)
111
- wstr = print_number_llu_r(wstr, uvalue);
112
- else
113
- wstr = print_number_lu_r(wstr, uvalue);
114
-#else
115
- do *wstr++ = (char)('0' + (uvalue % 10)); while(uvalue /= 10);
116
-#endif
114
+ switch (sizeof(void *)) {
115
+ case 4:
116
+ wstr = (uvalue > (unsigned long long) 0xffffffff) ? print_number_llu_r(wstr, uvalue) :
117
+ print_number_lu_r(wstr, uvalue);
118
+ break;
119
+ case 8:
120
+ do {
121
+ *wstr++ = (char) ('0' + (uvalue % 10));
122
+ } while (uvalue /= 10);
123
+ break;
124
+ default:
125
+ fatal("Netdata supports only 32-bit & 64-bit systems.");
126
+ }
127
128
// terminate it
129
*wstr = '\0';
libnetdata/libnetdata.h
-8
@@ -168,14 +168,6 @@ extern "C" {
168
// ----------------------------------------------------------------------------
169
// netdata common definitions
170
171
-#if (SIZEOF_VOID_P == 8)
172
-#define ENVIRONMENT64
173
-#elif (SIZEOF_VOID_P == 4)
174
-#define ENVIRONMENT32
175
-#else
176
-#error "Cannot detect if this is a 32 or 64 bit CPU"
177
-#endif
178
-
171
#ifdef __GNUC__
172
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
173
#endif // __GNUC__