Using unsigned long is sufficient no need to be more
verbose and use unsigned long int.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
include/json_print.h | 6 +++---
include/json_writer.h | 8 ++++----
lib/json_print.c | 4 ++--
lib/json_writer.c | 8 ++++----
lib/utils.c | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/json_print.h b/include/json_print.h
index 218da31a73fe..ee087c3e627a 100644
--- a/include/json_print.h
+++ b/include/json_print.h
@@ -66,9 +66,9 @@ _PRINT_FUNC(uint, unsigned int);
_PRINT_FUNC(u64, uint64_t);
_PRINT_FUNC(hu, unsigned short);
_PRINT_FUNC(hex, unsigned int);
-_PRINT_FUNC(0xhex, unsigned long long int);
-_PRINT_FUNC(luint, unsigned long int);
-_PRINT_FUNC(lluint, unsigned long long int);
+_PRINT_FUNC(0xhex, unsigned long long);
+_PRINT_FUNC(luint, unsigned long);
+_PRINT_FUNC(lluint, unsigned long long);
_PRINT_FUNC(float, double);
#undef _PRINT_FUNC
diff --git a/include/json_writer.h b/include/json_writer.h
index 0c8831c1136d..17d409e0557d 100644
--- a/include/json_writer.h
+++ b/include/json_writer.h
@@ -42,8 +42,8 @@ void jsonw_hu(json_writer_t *self, unsigned short number);
void jsonw_int(json_writer_t *self, int number);
void jsonw_s64(json_writer_t *self, int64_t number);
void jsonw_null(json_writer_t *self);
-void jsonw_luint(json_writer_t *self, unsigned long int num);
-void jsonw_lluint(json_writer_t *self, unsigned long long int num);
+void jsonw_luint(json_writer_t *self, unsigned long num);
+void jsonw_lluint(json_writer_t *self, unsigned long long num);
/* Useful Combinations of name and value */
void jsonw_string_field(json_writer_t *self, const char *prop, const char
*val);
@@ -57,9 +57,9 @@ void jsonw_int_field(json_writer_t *self, const char *prop,
int num);
void jsonw_s64_field(json_writer_t *self, const char *prop, int64_t num);
void jsonw_null_field(json_writer_t *self, const char *prop);
void jsonw_luint_field(json_writer_t *self, const char *prop,
- unsigned long int num);
+ unsigned long num);
void jsonw_lluint_field(json_writer_t *self, const char *prop,
- unsigned long long int num);
+ unsigned long long num);
/* Collections */
void jsonw_start_object(json_writer_t *self);
diff --git a/lib/json_print.c b/lib/json_print.c
index f7ef41c1570f..54fa40cff142 100644
--- a/lib/json_print.c
+++ b/lib/json_print.c
@@ -121,8 +121,8 @@ _PRINT_FUNC(s64, int64_t);
_PRINT_FUNC(hu, unsigned short);
_PRINT_FUNC(uint, unsigned int);
_PRINT_FUNC(u64, uint64_t);
-_PRINT_FUNC(luint, unsigned long int);
-_PRINT_FUNC(lluint, unsigned long long int);
+_PRINT_FUNC(luint, unsigned long);
+_PRINT_FUNC(lluint, unsigned long long);
_PRINT_FUNC(float, double);
#undef _PRINT_FUNC
diff --git a/lib/json_writer.c b/lib/json_writer.c
index 68890b34ee92..5779ec067daa 100644
--- a/lib/json_writer.c
+++ b/lib/json_writer.c
@@ -231,12 +231,12 @@ void jsonw_xint(json_writer_t *self, uint64_t num)
jsonw_printf(self, "%"PRIx64, num);
}
-void jsonw_luint(json_writer_t *self, unsigned long int num)
+void jsonw_luint(json_writer_t *self, unsigned long num)
{
jsonw_printf(self, "%lu", num);
}
-void jsonw_lluint(json_writer_t *self, unsigned long long int num)
+void jsonw_lluint(json_writer_t *self, unsigned long long num)
{
jsonw_printf(self, "%llu", num);
}
@@ -296,7 +296,7 @@ void jsonw_hu_field(json_writer_t *self, const char *prop,
unsigned short num)
void jsonw_luint_field(json_writer_t *self,
const char *prop,
- unsigned long int num)
+ unsigned long num)
{
jsonw_name(self, prop);
jsonw_luint(self, num);
@@ -304,7 +304,7 @@ void jsonw_luint_field(json_writer_t *self,
void jsonw_lluint_field(json_writer_t *self,
const char *prop,
- unsigned long long int num)
+ unsigned long long num)
{
jsonw_name(self, prop);
jsonw_lluint(self, num);
diff --git a/lib/utils.c b/lib/utils.c
index 4965a5750880..84733890587d 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1478,7 +1478,7 @@ char *int_to_str(int val, char *buf)
int get_guid(__u64 *guid, const char *arg)
{
- unsigned long int tmp;
+ unsigned long tmp;
char *endptr;
int i;
--
2.19.2
