mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Change %z to %d with casts for portability

pull/149/head
Michael Black 2019-11-30 13:05:21 -06:00
rodzic c69502e11c
commit dc3f33bc11
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
6 zmienionych plików z 19 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
adat/adat.c
Wyświetl plik

@ -601,8 +601,8 @@ size_t trimwhitespace(char *out, size_t len, const char *str)
gFnLevel++; gFnLevel++;
rig_debug(RIG_DEBUG_TRACE, rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): ENTRY. In -> '%s', %zu\n", "*** ADAT: %d %s (%s:%d): ENTRY. In -> '%s', %d\n",
gFnLevel, __func__, __FILE__, __LINE__, str, len); gFnLevel, __func__, __FILE__, __LINE__, str, (int)len);
if (len == 0) if (len == 0)
{ {
@ -643,8 +643,8 @@ size_t trimwhitespace(char *out, size_t len, const char *str)
out[out_size] = 0; out[out_size] = 0;
rig_debug(RIG_DEBUG_TRACE, rig_debug(RIG_DEBUG_TRACE,
"*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %zu\n", "*** ADAT: %d %s (%s:%d): EXIT. Out -> \"%s\", %d\n",
gFnLevel, __func__, __FILE__, __LINE__, out, out_size); gFnLevel, __func__, __FILE__, __LINE__, out, (int)out_size);
gFnLevel--; gFnLevel--;
return out_size; return out_size;

4
src/network.c
Wyświetl plik

@ -98,7 +98,7 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
0, 0,
NULL)) NULL))
{ {
rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, lpMsgBuf); rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char*)lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
else else
@ -312,7 +312,7 @@ void network_flush(hamlib_port_t *rp)
rig_debug(RIG_DEBUG_WARN, rig_debug(RIG_DEBUG_WARN,
"%s: network data clear d: ret=%d, len=%d, '%s'\n", "%s: network data clear d: ret=%d, len=%d, '%s'\n",
__func__, __func__,
ret, len, buffer); ret, (int)len, buffer);
len_read = recv(rp->fd, buffer, len < NET_BUFFER_SIZE ? len : NET_BUFFER_SIZE, len_read = recv(rp->fd, buffer, len < NET_BUFFER_SIZE ? len : NET_BUFFER_SIZE,
0); 0);

2
tests/ampctld.c
Wyświetl plik

@ -135,7 +135,7 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
NULL)) NULL))
{ {
rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, lpMsgBuf); rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char*)lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
else else

2
tests/rigctld.c
Wyświetl plik

@ -212,7 +212,7 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
(LPTSTR)&lpMsgBuf, 0, NULL)) (LPTSTR)&lpMsgBuf, 0, NULL))
{ {
rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, lpMsgBuf); rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char*)lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
else else

2
tests/rotctld.c
Wyświetl plik

@ -130,7 +130,7 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
NULL)) NULL))
{ {
rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, lpMsgBuf); rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char*)lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
else else

20
yaesu/newcat.c
Wyświetl plik

@ -1664,8 +1664,8 @@ int newcat_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
if (offset == 0) if (offset == 0)
{ {
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: incorrect length of IF response, expected 27 or 28, got %zu", __func__, "%s: incorrect length of IF response, expected 27 or 28, got %du", __func__,
strlen(priv->ret_data)); (int)strlen(priv->ret_data));
return -RIG_EPROTO; return -RIG_EPROTO;
} }
@ -1762,8 +1762,8 @@ int newcat_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
if (offset == 0) if (offset == 0)
{ {
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: incorrect length of IF response, expected 27 or 28, got %zu", __func__, "%s: incorrect length of IF response, expected 27 or 28, got %du", __func__,
strlen(priv->ret_data)); (int)strlen(priv->ret_data));
return -RIG_EPROTO; return -RIG_EPROTO;
} }
@ -4515,9 +4515,9 @@ int newcat_get_channel(RIG *rig, channel_t *chan)
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
} }
rig_debug(RIG_DEBUG_TRACE, "sizeof(channel_t) = %zu\n", sizeof(channel_t)); rig_debug(RIG_DEBUG_TRACE, "sizeof(channel_t) = %d\n", (int)sizeof(channel_t));
rig_debug(RIG_DEBUG_TRACE, "sizeof(priv->cmd_str) = %zu\n", rig_debug(RIG_DEBUG_TRACE, "sizeof(priv->cmd_str) = %d\n",
sizeof(priv->cmd_str)); (int)sizeof(priv->cmd_str));
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MR%03d%c", chan->channel_num, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "MR%03d%c", chan->channel_num,
cat_term); cat_term);
@ -5622,7 +5622,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/* end else */ /* end else */
rig_debug(RIG_DEBUG_TRACE, "sizeof(width_str) = %zu\n", sizeof(width_str)); rig_debug(RIG_DEBUG_TRACE, "sizeof(width_str) = %d\n", (int)sizeof(width_str));
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NA%c%c%cSH%c%s%c", snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NA%c%c%cSH%c%s%c",
main_sub_vfo, narrow, cat_term, main_sub_vfo, width_str, cat_term); main_sub_vfo, narrow, cat_term, main_sub_vfo, width_str, cat_term);
@ -6076,8 +6076,8 @@ int newcat_get_vfo_mode(RIG *rig, vfo_t *vfo_mode)
default: default:
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: incorrect length of IF response, expected 27 or 28, got %zu", __func__, "%s: incorrect length of IF response, expected 27 or 28, got %d", __func__,
strlen(priv->ret_data)); (int)strlen(priv->ret_data));
return -RIG_EPROTO; return -RIG_EPROTO;
} }