diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-11-19 11:25:17 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-11-19 16:31:42 +0000 |
| commit | cb090e81ec64012e1a3094670aeb8658cb550f1e (patch) | |
| tree | 54bc99cf6f4849c9865ee8928e453a418863384d /wsutil | |
| parent | 67ab27a15b671159b5b7ba2d01981a726b6054bc (diff) | |
[pedantic] Replace usage of 'long' and 'long long'
Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208
Reviewed-on: https://code.wireshark.org/review/5395
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/bits_count_ones.h | 2 | ||||
| -rw-r--r-- | wsutil/tempfile.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h index f9a8c7c12b..fbaf820794 100644 --- a/wsutil/bits_count_ones.h +++ b/wsutil/bits_count_ones.h @@ -39,7 +39,7 @@ static inline int ws_count_ones(const guint64 x) { - unsigned long long bits = x; + guint64 bits = x; bits = bits - ((bits >> 1) & G_GUINT64_CONSTANT(0x5555555555555555)); bits = (bits & G_GUINT64_CONSTANT(0x3333333333333333)) + ((bits >> 2) & G_GUINT64_CONSTANT(0x3333333333333333)); diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index 20efc80438..dab286752f 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c @@ -171,7 +171,7 @@ create_tempfile(char **namebuf, const char *pfx) { static struct _tf { char *path; - unsigned long len; + size_t len; } tf[MAX_TEMPFILES]; static int idx; @@ -218,7 +218,7 @@ create_tempfile(char **namebuf, const char *pfx) tmp_file = g_strconcat(tmp_dir, sep, safe_pfx, "_", timestr, "_", TMP_FILE_SUFFIX, NULL); g_free(safe_pfx); if (strlen(tmp_file) > tf[idx].len) { - tf[idx].len = (int)strlen(tmp_file) + 1; + tf[idx].len = strlen(tmp_file) + 1; tf[idx].path = (char *)g_realloc(tf[idx].path, tf[idx].len); } g_strlcpy(tf[idx].path, tmp_file, tf[idx].len); |