Fixing some implicit coversations (-Wshorten-64-to-32)

Fixing some "implicit conversion loses integer precision" warnings
reported by clang with -Wshorten-64-to-32 option

Change-Id: Icd641d5f4fd8ff129f03f1b9e1da0fc86329f096
Reviewed-on: https://code.wireshark.org/review/31901
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 13 insertions, 13 deletions

diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index cf8bbebab0..855d318a12 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -742,7 +742,7 @@ void Iax2AnalysisDialog::savePayload(QTemporaryFile *tmpfile, packet_info *pinfo
 
     if (iax2info->payload_len > 0) {
         const char *data = (const char *) iax2info->payload_data;
-        size_t nchars;
+        qint64 nchars;
 
         nchars = tmpfile->write(data, iax2info->payload_len);
         if (nchars != (iax2info->payload_len)) {
@@ -908,7 +908,7 @@ void Iax2AnalysisDialog::saveAudio(Iax2AnalysisDialog::StreamDirection direction
     gint16     sample;
     guint8     pd[4];
     gboolean   stop_flag = FALSE;
-    size_t     nchars;
+    qint64     nchars;
 
     save_file.open(QIODevice::WriteOnly);
     fwd_tempfile_->seek(0);
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 69ef77254e..bc54d70820 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -796,7 +796,7 @@ void RtpAnalysisDialog::savePayload(QTemporaryFile *tmpfile, tap_rtp_stat_t *sta
         (rtpinfo->info_payload_type == PT_CN_OLD)) {
     } else { /* All other payloads */
         const char *data;
-        size_t nchars;
+        qint64 nchars;
         tap_rtp_save_data_t save_data;
 
         if (!rtpinfo->info_all_data_present) {
@@ -827,7 +827,7 @@ void RtpAnalysisDialog::savePayload(QTemporaryFile *tmpfile, tap_rtp_stat_t *sta
         }
         if (save_data.payload_len > 0) {
             nchars = tmpfile->write(data, save_data.payload_len);
-            if (nchars != save_data.payload_len) {
+            if ((size_t)nchars != save_data.payload_len) {
                 /* Write error or short write */
                 err_str_ = tr("Can't save in a file: File I/O problem.");
                 save_payload_error_ = TAP_RTP_FILE_WRITE_ERROR;
@@ -1072,7 +1072,7 @@ size_t RtpAnalysisDialog::convert_payload_to_samples(unsigned int payload_type,
 
 gboolean RtpAnalysisDialog::saveAudioAUSilence(size_t total_len, QFile *save_file, gboolean *stop_flag)
 {
-    size_t nchars;
+    qint64 nchars;
     guint8 pd_out[2*4000];
     gint16 silence;
     guint8 pd[4];
@@ -1095,9 +1095,9 @@ gboolean RtpAnalysisDialog::saveAudioAUSilence(size_t total_len, QFile *save_fil
     return TRUE;
 }
 
-gboolean RtpAnalysisDialog::saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTemporaryFile *tempfile, QFile *save_file, size_t header_end, gboolean *stop_flag, gboolean interleave, size_t prefix_silence)
+gboolean RtpAnalysisDialog::saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTemporaryFile *tempfile, QFile *save_file, qint64 header_end, gboolean *stop_flag, gboolean interleave, size_t prefix_silence)
 {
-    size_t nchars;
+    qint64 nchars;
     guint8 pd_out[2*4000];
     guint8 pd[4];
     tap_rtp_save_data_t save_data;
@@ -1125,7 +1125,7 @@ gboolean RtpAnalysisDialog::saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTempora
                 }
                 nchars += save_file->write((const char *)pd, 2);
             }
-            if (nchars < sample_count*2) {
+            if ((size_t)nchars < sample_count*2) {
                 return FALSE;
             }
         }
@@ -1134,7 +1134,7 @@ gboolean RtpAnalysisDialog::saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTempora
     return TRUE;
 }
 
-gboolean RtpAnalysisDialog::saveAudioAUBidir(tap_rtp_stat_t &fwd_statinfo, tap_rtp_stat_t &rev_statinfo, QTemporaryFile *fwd_tempfile, QTemporaryFile *rev_tempfile, QFile *save_file, size_t header_end, gboolean *stop_flag, size_t prefix_silence_fwd, size_t prefix_silence_rev)
+gboolean RtpAnalysisDialog::saveAudioAUBidir(tap_rtp_stat_t &fwd_statinfo, tap_rtp_stat_t &rev_statinfo, QTemporaryFile *fwd_tempfile, QTemporaryFile *rev_tempfile, QFile *save_file, qint64 header_end, gboolean *stop_flag, size_t prefix_silence_fwd, size_t prefix_silence_rev)
 {
     if (! saveAudioAUUnidir(fwd_statinfo, fwd_tempfile, save_file, header_end, stop_flag, TRUE, prefix_silence_fwd))
     {
@@ -1151,8 +1151,8 @@ gboolean RtpAnalysisDialog::saveAudioAUBidir(tap_rtp_stat_t &fwd_statinfo, tap_r
 gboolean RtpAnalysisDialog::saveAudioAU(StreamDirection direction, QFile *save_file, gboolean *stop_flag, RtpAnalysisDialog::SyncType sync)
 {
     guint8 pd[4];
-    size_t nchars;
-    size_t header_end;
+    qint64 nchars;
+    qint64 header_end;
     size_t fwd_total_len;
     size_t rev_total_len;
     size_t total_len;
diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h
index 2e1971c430..8a843b7df6 100644
--- a/ui/qt/rtp_analysis_dialog.h
+++ b/ui/qt/rtp_analysis_dialog.h
@@ -128,8 +128,8 @@ private:
 
     size_t convert_payload_to_samples(unsigned int payload_type, QTemporaryFile *tempfile, guint8 *pd_out, size_t expected_nchars);
     gboolean saveAudioAUSilence(size_t total_len, QFile *save_file, gboolean *stop_flag);
-    gboolean saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTemporaryFile *tempfile, QFile *save_file, size_t header_end, gboolean *stop_flag, gboolean interleave, size_t prefix_silence);
-    gboolean saveAudioAUBidir(tap_rtp_stat_t &fwd_statinfo, tap_rtp_stat_t &rev_statinfo, QTemporaryFile *fwd_tempfile, QTemporaryFile *rev_tempfile, QFile *save_file, size_t header_end, gboolean *stop_flag, size_t prefix_silence_fwd, size_t prefix_silence_rev);
+    gboolean saveAudioAUUnidir(tap_rtp_stat_t &statinfo, QTemporaryFile *tempfile, QFile *save_file, qint64 header_end, gboolean *stop_flag, gboolean interleave, size_t prefix_silence);
+    gboolean saveAudioAUBidir(tap_rtp_stat_t &fwd_statinfo, tap_rtp_stat_t &rev_statinfo, QTemporaryFile *fwd_tempfile, QTemporaryFile *rev_tempfile, QFile *save_file, qint64 header_end, gboolean *stop_flag, size_t prefix_silence_fwd, size_t prefix_silence_rev);
     gboolean saveAudioAU(StreamDirection direction, QFile *save_file, gboolean *stop_flag, RtpAnalysisDialog::SyncType sync);
     gboolean saveAudioRAW(StreamDirection direction, QFile *save_file, gboolean *stop_flag);
     void saveAudio(StreamDirection direction, RtpAnalysisDialog::SyncType sync);