diff options
| author | unknown <konstantin@mysql.com> | 2004-08-25 17:20:12 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-08-25 17:20:12 +0400 |
| commit | 7dfdfa9fa397927963b4754d86fcf77ae3f036c5 (patch) | |
| tree | 30cf0e191daa9cbab0b6e50d470cbbeb29cfd0d7 /libmysql | |
| parent | b20d1ce4f3fb187d3c2a48479b85234c81fe85d0 (diff) | |
| download | mariadb-git-7dfdfa9fa397927963b4754d86fcf77ae3f036c5.tar.gz | |
Cleanup.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index cea8ce3a499..2ddbaa0b693 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3393,7 +3393,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, longlong value) { char *buffer= (char *)param->buffer; - uint field_is_unsigned= (field->flags & UNSIGNED_FLAG); + uint field_is_unsigned= field->flags & UNSIGNED_FLAG; switch (param->buffer_type) { case MYSQL_TYPE_NULL: /* do nothing */ @@ -3590,14 +3590,14 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, { ulong length; enum enum_field_types field_type= field->type; + uint field_is_unsigned= field->flags & UNSIGNED_FLAG; switch (field_type) { case MYSQL_TYPE_TINY: { char value= (char) **row; - uint field_is_unsigned= (field->flags & UNSIGNED_FLAG); - longlong data= (field_is_unsigned) ? (longlong) (unsigned char) value: - (longlong) value; + longlong data= field_is_unsigned ? (longlong) (unsigned char) value : + (longlong) value; fetch_long_with_conversion(param, field, data); length= 1; break; @@ -3606,9 +3606,8 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_YEAR: { short value= sint2korr(*row); - uint field_is_unsigned= (field->flags & UNSIGNED_FLAG); - longlong data= ((field_is_unsigned) ? (longlong) (unsigned short) value: - (longlong) value); + longlong data= field_is_unsigned ? (longlong) (unsigned short) value : + (longlong) value; fetch_long_with_conversion(param, field, data); length= 2; break; @@ -3616,9 +3615,8 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_LONG: { long value= sint4korr(*row); - uint field_is_unsigned= (field->flags & UNSIGNED_FLAG); - longlong data= ((field_is_unsigned) ? (longlong) (unsigned long) value: - (longlong) value); + longlong data= field_is_unsigned ? (longlong) (unsigned long) value : + (longlong) value; fetch_long_with_conversion(param, field, data); length= 4; break; |