diff options
| author | konstantin@mysql.com <> | 2003-12-10 22:26:31 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2003-12-10 22:26:31 +0300 |
| commit | 124c4ca346a46a68febd044f97ad12965643e1b8 (patch) | |
| tree | bbfbb126a26544bfe84128c5ea57d8cc2355ef69 /sql/item_func.cc | |
| parent | ea81fd27bb4bb2e62f418317e4b4d2961efa7a94 (diff) | |
| download | mariadb-git-124c4ca346a46a68febd044f97ad12965643e1b8.tar.gz | |
cleanup: if there is return from if-part, we don't need else statement
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 8d7ee637d73..64b1c5d4d8a 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -214,8 +214,7 @@ String *Item_real_func::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals); + str->set(nr,decimals); return str; } @@ -227,7 +226,7 @@ String *Item_num_func::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr); else str->set((ulonglong) nr); @@ -237,8 +236,7 @@ String *Item_num_func::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals); + str->set(nr,decimals); } return str; } @@ -257,7 +255,7 @@ String *Item_int_func::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr); else str->set((ulonglong) nr); @@ -286,7 +284,7 @@ String *Item_num_op::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr); else str->set((ulonglong) nr); @@ -296,8 +294,7 @@ String *Item_num_op::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals); + str->set(nr,decimals); } return str; } @@ -799,7 +796,7 @@ String *Item_func_min_max::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr); else str->set((ulonglong) nr); @@ -810,8 +807,7 @@ String *Item_func_min_max::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals); + str->set(nr,decimals); return str; } case STRING_RESULT: @@ -1392,8 +1388,7 @@ String *Item_func_udf_float::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals); + str->set(nr,decimals); return str; } @@ -1413,7 +1408,7 @@ String *Item_func_udf_int::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr); else str->set((ulonglong) nr); |