Skip to content

Commit d5cec4d

Browse files
wb2oszwb2osz
committed
Fix compiler warnings for platforms where size of long is different than size of pointer.
1 parent ff9eca6 commit d5cec4d

12 files changed

+45
-41
lines changed

‎external/regex/regcomp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2510,7 +2510,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
25102510
old_tree = NULL;
25112511

25122512
if (elem->token.type == SUBEXP)
2513-
postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx);
2513+
postorder (elem, mark_opt_subexp, (void *) (ptrdiff_t) elem->token.opr.idx);
25142514

25152515
tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT));
25162516
if (BE (tree == NULL, 0))
@@ -3725,7 +3725,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
37253725
static reg_errcode_t
37263726
mark_opt_subexp (void *extra, bin_tree_t *node)
37273727
{
3728-
int idx = (int) (long) extra;
3728+
int idx = (int) (ptrdiff_t) extra;
37293729
if (node->token.type == SUBEXP && node->token.opr.idx == idx)
37303730
node->token.opt_subexp = 1;
37313731

‎src/aclients.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -283,21 +283,21 @@ int main (int argc, char *argv[])
283283

284284
#if __WIN32__
285285
if (isdigit(port[j][0])) {
286-
client_th[j] = (HANDLE)_beginthreadex (NULL, 0, client_thread_net, (void *)j, 0, NULL);
286+
client_th[j] = (HANDLE)_beginthreadex (NULL, 0, client_thread_net, (void *)(ptrdiff_t)j, 0, NULL);
287287
}
288288
else {
289-
client_th[j] = (HANDLE)_beginthreadex (NULL, 0, client_thread_serial, (void *)j, 0, NULL);
289+
client_th[j] = (HANDLE)_beginthreadex (NULL, 0, client_thread_serial, (void *)(ptrdiff_t)j, 0, NULL);
290290
}
291291
if (client_th[j] == NULL) {
292292
printf ("Internal error: Could not create client thread %d.\n", j);
293293
exit (1);
294294
}
295295
#else
296296
if (isdigit(port[j][0])) {
297-
e = pthread_create (&client_tid[j], NULL, client_thread_net, (void *)(long)j);
297+
e = pthread_create (&client_tid[j], NULL, client_thread_net, (void *)(ptrdiff_t)j);
298298
}
299299
else {
300-
e = pthread_create (&client_tid[j], NULL, client_thread_serial, (void *)(long)j);
300+
e = pthread_create (&client_tid[j], NULL, client_thread_serial, (void *)(ptrdiff_t)j);
301301
}
302302
if (e != 0) {
303303
perror("Internal error: Could not create client thread.");
@@ -394,7 +394,7 @@ static void * client_thread_net (void *arg)
394394
int use_chan = -1;
395395

396396

397-
my_index = (int)(long)arg;
397+
my_index = (int)(ptrdiff_t)arg;
398398

399399
#if DEBUGx
400400
printf ("DEBUG: client_thread_net %d start, port = '%s'\n", my_index, port[my_index]);
@@ -664,7 +664,7 @@ static unsigned __stdcall client_thread_serial (void *arg)
664664
static void * client_thread_serial (void *arg)
665665
#endif
666666
{
667-
int my_index = (int)(long)arg;
667+
int my_index = (int)(ptrdiff_t)arg;
668668

669669
#if __WIN32__
670670

‎src/beacon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void beacon_init (struct audio_s *pmodem, struct misc_config_s *pconfig, struct
383383
#else
384384
int e;
385385

386-
e = pthread_create (&beacon_tid, NULL, beacon_thread, (void *)0);
386+
e = pthread_create (&beacon_tid, NULL, beacon_thread, NULL);
387387
if (e != 0) {
388388
text_color_set(DW_COLOR_ERROR);
389389
perror("Could not create beacon thread");

‎src/dwgpsd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ int dwgpsd_init (struct misc_config_s *pconfig, int debug)
193193

194194
gps_stream(&gpsdata, WATCH_ENABLE | WATCH_JSON, NULL);
195195

196-
e = pthread_create (&read_gps_tid, NULL, read_gpsd_thread, (void *)(long)arg);
196+
e = pthread_create (&read_gps_tid, NULL, read_gpsd_thread, (void *)(ptrdiff_t)arg);
197197
if (e != 0) {
198198
text_color_set(DW_COLOR_ERROR);
199199
perror("Could not create GPS reader thread");

‎src/dwgpsnmea.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ int dwgpsnmea_init (struct misc_config_s *pconfig, int debug)
151151

152152
if (s_gpsnmea_port_fd != MYFDERROR) {
153153
#if __WIN32__
154-
read_gps_th = (HANDLE)_beginthreadex (NULL, 0, read_gpsnmea_thread, (void*)(long)s_gpsnmea_port_fd, 0, NULL);
154+
read_gps_th = (HANDLE)_beginthreadex (NULL, 0, read_gpsnmea_thread, (void*)(ptrdiff_t)s_gpsnmea_port_fd, 0, NULL);
155155
if (read_gps_th == NULL) {
156156
text_color_set(DW_COLOR_ERROR);
157157
dw_printf ("Could not create GPS NMEA listening thread.\n");
158158
return (-1);
159159
}
160160
#else
161161
int e;
162-
e = pthread_create (&read_gps_tid, NULL, read_gpsnmea_thread, (void*)(long)s_gpsnmea_port_fd);
162+
e = pthread_create (&read_gps_tid, NULL, read_gpsnmea_thread, (void*)(ptrdiff_t)s_gpsnmea_port_fd);
163163
if (e != 0) {
164164
text_color_set(DW_COLOR_ERROR);
165165
perror("Could not create GPS NMEA listening thread.");
@@ -216,7 +216,7 @@ static unsigned __stdcall read_gpsnmea_thread (void *arg)
216216
static void * read_gpsnmea_thread (void *arg)
217217
#endif
218218
{
219-
MYFDTYPE fd = (MYFDTYPE)(long)arg;
219+
MYFDTYPE fd = (MYFDTYPE)(ptrdiff_t)arg;
220220

221221
// Maximum length of message from GPS receiver is 82 according to some people.
222222
// Make buffer considerably larger to be safe.
@@ -230,7 +230,7 @@ static void * read_gpsnmea_thread (void *arg)
230230

231231
if (s_debug >= 2) {
232232
text_color_set(DW_COLOR_DEBUG);
233-
dw_printf ("read_gpsnmea_thread (%d)\n", (int)(long)arg);
233+
dw_printf ("read_gpsnmea_thread (%d)\n", (int)(ptrdiff_t)arg);
234234
}
235235

236236
dwgps_clear (&info);

‎src/igate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ void igate_init (struct audio_s *p_audio_config, struct igate_config_s *p_igate_
466466
return;
467467
}
468468
#else
469-
e = pthread_create (&connect_listen_tid, NULL, connnect_thread, (void *)NULL);
469+
e = pthread_create (&connect_listen_tid, NULL, connnect_thread, NULL);
470470
if (e != 0) {
471471
text_color_set(DW_COLOR_ERROR);
472472
perror("Internal error: Could not create IGate connection thread");

‎src/kissnet.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ void kissnet_init (struct misc_config_s *mc)
231231
* This waits for a client to connect and sets client_sock[n].
232232
*/
233233
#if __WIN32__
234-
connect_listen_th = (HANDLE)_beginthreadex (NULL, 0, connect_listen_thread, (void *)kiss_port, 0, NULL);
234+
connect_listen_th = (HANDLE)_beginthreadex (NULL, 0, connect_listen_thread, (void *)(ptrdiff_t)kiss_port, 0, NULL);
235235
if (connect_listen_th == NULL) {
236236
text_color_set(DW_COLOR_ERROR);
237237
dw_printf ("Could not create KISS socket connect listening thread\n");
238238
return;
239239
}
240240
#else
241-
e = pthread_create (&connect_listen_tid, NULL, connect_listen_thread, (void *)(long)kiss_port);
241+
e = pthread_create (&connect_listen_tid, NULL, connect_listen_thread, (void *)(ptrdiff_t)kiss_port);
242242
if (e != 0) {
243243
text_color_set(DW_COLOR_ERROR);
244244
perror("Could not create KISS socket connect listening thread");
@@ -254,14 +254,14 @@ void kissnet_init (struct misc_config_s *mc)
254254
for (client = 0; client < MAX_NET_CLIENTS; client++) {
255255

256256
#if __WIN32__
257-
cmd_listen_th[client] = (HANDLE)_beginthreadex (NULL, 0, kissnet_listen_thread, (void*)client, 0, NULL);
257+
cmd_listen_th[client] = (HANDLE)_beginthreadex (NULL, 0, kissnet_listen_thread, (void*)(ptrdiff_t)client, 0, NULL);
258258
if (cmd_listen_th[client] == NULL) {
259259
text_color_set(DW_COLOR_ERROR);
260260
dw_printf ("Could not create KISS command listening thread for client %d\n", client);
261261
return;
262262
}
263263
#else
264-
e = pthread_create (&(cmd_listen_tid[client]), NULL, kissnet_listen_thread, (void *)(long)client);
264+
e = pthread_create (&(cmd_listen_tid[client]), NULL, kissnet_listen_thread, (void *)(ptrdiff_t)client);
265265
if (e != 0) {
266266
text_color_set(DW_COLOR_ERROR);
267267
dw_printf ("Could not create KISS command listening thread for client %d\n", client);
@@ -305,10 +305,10 @@ static THREAD_F connect_listen_thread (void *arg)
305305
SOCKET listen_sock;
306306
WSADATA wsadata;
307307

308-
snprintf (kiss_port_str, sizeof(kiss_port_str), "%d", (int)(long)arg);
308+
snprintf (kiss_port_str, sizeof(kiss_port_str), "%d", (int)(ptrdiff_t)arg);
309309
#if DEBUG
310310
text_color_set(DW_COLOR_DEBUG);
311-
dw_printf ("DEBUG: kissnet port = %d = '%s'\n", (int)(long)arg, kiss_port_str);
311+
dw_printf ("DEBUG: kissnet port = %d = '%s'\n", (int)(ptrdiff_t)arg, kiss_port_str);
312312
#endif
313313
err = WSAStartup (MAKEWORD(2,2), &wsadata);
314314
if (err != 0) {
@@ -425,7 +425,7 @@ static THREAD_F connect_listen_thread (void *arg)
425425

426426
struct sockaddr_in sockaddr; /* Internet socket address stuct */
427427
socklen_t sockaddr_size = sizeof(struct sockaddr_in);
428-
int kiss_port = (int)(long)arg;
428+
int kiss_port = (int)(ptrdiff_t)arg;
429429
int listen_sock;
430430
int bcopt = 1;
431431

@@ -808,7 +808,7 @@ static THREAD_F kissnet_listen_thread (void *arg)
808808
unsigned char ch;
809809

810810

811-
int client = (int)(long)arg;
811+
int client = (int)(ptrdiff_t)arg;
812812

813813
#if DEBUG
814814
text_color_set(DW_COLOR_DEBUG);

‎src/kissutil.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ int main (int argc, char *argv[])
285285

286286
#if __WIN32__
287287
if (using_tcp) {
288-
tnc_th = (HANDLE)_beginthreadex (NULL, 0, tnc_listen_net, (void *)99, 0, NULL);
288+
tnc_th = (HANDLE)_beginthreadex (NULL, 0, tnc_listen_net, (void *)(ptrdiff_t)99, 0, NULL);
289289
}
290290
else {
291291
tnc_th = (HANDLE)_beginthreadex (NULL, 0, tnc_listen_serial, (void *)99, 0, NULL);
@@ -296,10 +296,10 @@ int main (int argc, char *argv[])
296296
}
297297
#else
298298
if (using_tcp) {
299-
e = pthread_create (&tnc_tid, NULL, tnc_listen_net, (void *)(long)99);
299+
e = pthread_create (&tnc_tid, NULL, tnc_listen_net, (void *)(ptrdiff_t)99);
300300
}
301301
else {
302-
e = pthread_create (&tnc_tid, NULL, tnc_listen_serial, (void *)(long)99);
302+
e = pthread_create (&tnc_tid, NULL, tnc_listen_serial, (void *)(ptrdiff_t)99);
303303
}
304304
if (e != 0) {
305305
perror("Internal error: Could not create TNC listen thread.");

‎src/log.c

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
#include <unistd.h>
5252
#include <errno.h>
5353

54+
#if __WIN32__
55+
#include <direct.h> // for _mkdir()
56+
#endif
57+
5458
#include "ax25_pad.h"
5559
#include "textcolor.h"
5660
#include "decode_aprs.h"

‎src/recv.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ void recv_init (struct audio_s *pa)
160160
#endif
161161

162162
#if __WIN32__
163-
xmit_th[a] = (HANDLE)_beginthreadex (NULL, 0, recv_adev_thread, (void*)(long)a, 0, NULL);
163+
xmit_th[a] = (HANDLE)_beginthreadex (NULL, 0, recv_adev_thread, (void*)(ptrdiff_t)a, 0, NULL);
164164
if (xmit_th[a] == NULL) {
165165
text_color_set(DW_COLOR_ERROR);
166166
dw_printf ("FATAL: Could not create audio receive thread for device %d.\n", a);
167167
exit(1);
168168
}
169169
#else
170170
int e;
171-
e = pthread_create (&xmit_tid[a], NULL, recv_adev_thread, (void *)(long)a);
171+
e = pthread_create (&xmit_tid[a], NULL, recv_adev_thread, (void *)(ptrdiff_t)a);
172172

173173
if (e != 0) {
174174
text_color_set(DW_COLOR_ERROR);
@@ -203,7 +203,7 @@ static unsigned __stdcall recv_adev_thread (void *arg)
203203
static void * recv_adev_thread (void *arg)
204204
#endif
205205
{
206-
int a = (int)(long)arg; // audio device number.
206+
int a = (int)(ptrdiff_t)arg; // audio device number.
207207
int eof;
208208

209209
/* This audio device can have one (mono) or two (stereo) channels. */

‎src/server.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,14 @@ void server_init (struct audio_s *audio_config_p, struct misc_config_s *mc)
461461
* This waits for a client to connect and sets an available client_sock[n].
462462
*/
463463
#if __WIN32__
464-
connect_listen_th = (HANDLE)_beginthreadex (NULL, 0, connect_listen_thread, (void *)(unsigned int)server_port, 0, NULL);
464+
connect_listen_th = (HANDLE)_beginthreadex (NULL, 0, connect_listen_thread, (void *)(ptrdiff_t)server_port, 0, NULL);
465465
if (connect_listen_th == NULL) {
466466
text_color_set(DW_COLOR_ERROR);
467467
dw_printf ("Could not create AGW connect listening thread\n");
468468
return;
469469
}
470470
#else
471-
e = pthread_create (&connect_listen_tid, NULL, connect_listen_thread, (void *)(long)server_port);
471+
e = pthread_create (&connect_listen_tid, NULL, connect_listen_thread, (void *)(ptrdiff_t)server_port);
472472
if (e != 0) {
473473
text_color_set(DW_COLOR_ERROR);
474474
perror("Could not create AGW connect listening thread");
@@ -484,14 +484,14 @@ void server_init (struct audio_s *audio_config_p, struct misc_config_s *mc)
484484
for (client = 0; client < MAX_NET_CLIENTS; client++) {
485485

486486
#if __WIN32__
487-
cmd_listen_th[client] = (HANDLE)_beginthreadex (NULL, 0, cmd_listen_thread, (void*)client, 0, NULL);
487+
cmd_listen_th[client] = (HANDLE)_beginthreadex (NULL, 0, cmd_listen_thread, (void*)(ptrdiff_t)client, 0, NULL);
488488
if (cmd_listen_th[client] == NULL) {
489489
text_color_set(DW_COLOR_ERROR);
490490
dw_printf ("Could not create AGW command listening thread for client %d\n", client);
491491
return;
492492
}
493493
#else
494-
e = pthread_create (&cmd_listen_tid[client], NULL, cmd_listen_thread, (void *)(long)client);
494+
e = pthread_create (&cmd_listen_tid[client], NULL, cmd_listen_thread, (void *)(ptrdiff_t)client);
495495
if (e != 0) {
496496
text_color_set(DW_COLOR_ERROR);
497497
dw_printf ("Could not create AGW command listening thread for client %d\n", client);
@@ -535,10 +535,10 @@ static THREAD_F connect_listen_thread (void *arg)
535535
SOCKET listen_sock;
536536
WSADATA wsadata;
537537

538-
snprintf (server_port_str, sizeof(server_port_str), "%d", (int)(long)arg);
538+
snprintf (server_port_str, sizeof(server_port_str), "%d", (int)(ptrdiff_t)arg);
539539
#if DEBUG
540540
text_color_set(DW_COLOR_DEBUG);
541-
dw_printf ("DEBUG: serverport = %d = '%s'\n", (int)(long)arg, server_port_str);
541+
dw_printf ("DEBUG: serverport = %d = '%s'\n", (int)(ptrdiff_t)arg, server_port_str);
542542
#endif
543543
err = WSAStartup (MAKEWORD(2,2), &wsadata);
544544
if (err != 0) {
@@ -658,7 +658,7 @@ static THREAD_F connect_listen_thread (void *arg)
658658

659659
struct sockaddr_in sockaddr; /* Internet socket address stuct */
660660
socklen_t sockaddr_size = sizeof(struct sockaddr_in);
661-
int server_port = (int)(long)arg;
661+
int server_port = (int)(ptrdiff_t)arg;
662662
int listen_sock;
663663
int bcopt = 1;
664664

@@ -1265,7 +1265,7 @@ static THREAD_F cmd_listen_thread (void *arg)
12651265
/* Maximum for 'D': Info part length + 1 */
12661266
} cmd;
12671267

1268-
int client = (int)(long)arg;
1268+
int client = (int)(ptrdiff_t)arg;
12691269

12701270
assert (client >= 0 && client < MAX_NET_CLIENTS);
12711271

‎src/xmit.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void xmit_init (struct audio_s *p_modem, int debug_xmit_packet)
279279

280280
if (p_modem->achan[j].medium == MEDIUM_RADIO) {
281281
#if __WIN32__
282-
xmit_th[j] = (HANDLE)_beginthreadex (NULL, 0, xmit_thread, (void*)(long)j, 0, NULL);
282+
xmit_th[j] = (HANDLE)_beginthreadex (NULL, 0, xmit_thread, (void*)(ptrdiff_t)j, 0, NULL);
283283
if (xmit_th[j] == NULL) {
284284
text_color_set(DW_COLOR_ERROR);
285285
dw_printf ("Could not create xmit thread %d\n", j);
@@ -310,10 +310,10 @@ void xmit_init (struct audio_s *p_modem, int debug_xmit_packet)
310310
perror("pthread_attr_setschedparam");
311311
}
312312

313-
e = pthread_create (&(xmit_tid[j]), &attr, xmit_thread, (void *)(long)j);
313+
e = pthread_create (&(xmit_tid[j]), &attr, xmit_thread, (void *)(ptrdiff_t)j);
314314
pthread_attr_destroy (&attr);
315315
#else
316-
e = pthread_create (&(xmit_tid[j]), NULL, xmit_thread, (void *)(long)j);
316+
e = pthread_create (&(xmit_tid[j]), NULL, xmit_thread, (void *)(ptrdiff_t)j);
317317
#endif
318318
if (e != 0) {
319319
text_color_set(DW_COLOR_ERROR);
@@ -510,7 +510,7 @@ static unsigned __stdcall xmit_thread (void *arg)
510510
static void * xmit_thread (void *arg)
511511
#endif
512512
{
513-
int chan = (int)(long)arg; // channel number.
513+
int chan = (int)(ptrdiff_t)arg; // channel number.
514514
packet_t pp;
515515
int prio;
516516
int ok;

0 commit comments

Comments
 (0)