Commit 7e43ee41279bcd374a65e4d69a698c99d729a5eb
2024-08-05T18:20:53
fix tag_neg for return tag_integer_reduce
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/libkc3/tag_neg.c b/libkc3/tag_neg.c
index 9ef6b64..b10986a 100644
--- a/libkc3/tag_neg.c
+++ b/libkc3/tag_neg.c
@@ -15,75 +15,60 @@
#include "ratio.h"
#include "tag.h"
-s_tag * tag_neg (const s_tag *tag, s_tag *result)
+s_tag * tag_neg (const s_tag *tag, s_tag *dest)
{
- s16 i_s16;
s_integer tmp = {0};
switch (tag->type) {
case TAG_INTEGER:
- result->type = TAG_INTEGER;
- integer_neg(&tag->data.integer, &result->data.integer);
- return result;
+ dest->type = TAG_INTEGER;
+ integer_neg(&tag->data.integer, &dest->data.integer);
+ return tag_integer_reduce(dest);
case TAG_RATIO:
- result->type = TAG_RATIO;
- ratio_neg(&tag->data.ratio, &result->data.ratio);
- return result;
+ dest->type = TAG_RATIO;
+ ratio_neg(&tag->data.ratio, &dest->data.ratio);
+ return dest;
case TAG_SW:
- if (tag->data.sw == SW_MIN) {
- integer_init_sw(&tmp, tag->data.sw);
- result->type = TAG_INTEGER;
- integer_neg(&tmp, &result->data.integer);
- integer_clean(&tmp);
- return result;
- }
- return tag_init_sw(result, -tag->data.sw);
+ integer_init_sw(&tmp, tag->data.sw);
+ dest->type = TAG_INTEGER;
+ integer_neg(&tmp, &dest->data.integer);
+ integer_clean(&tmp);
+ return tag_integer_reduce(dest);
case TAG_S64:
- if (tag->data.s64 == S64_MIN) {
- integer_init_s64(&tmp, tag->data.s64);
- result->type = TAG_INTEGER;
- integer_neg(&tmp, &result->data.integer);
- integer_clean(&tmp);
- return result;
- }
- return tag_init_s64(result, -tag->data.s64);
+ integer_init_s64(&tmp, tag->data.s64);
+ dest->type = TAG_INTEGER;
+ integer_neg(&tmp, &dest->data.integer);
+ integer_clean(&tmp);
+ return tag_integer_reduce(dest);
case TAG_S32:
- return tag_init_s64(result, - (s64) tag->data.s32);
+ tag_init_s64(dest, - (s64) tag->data.s32);
+ return tag_integer_reduce(dest);
case TAG_S16:
- return tag_init_s32(result, - (s32) tag->data.s16);
+ tag_init_s32(dest, - (s32) tag->data.s16);
+ return tag_integer_reduce(dest);
case TAG_S8:
- i_s16 = - (s16) tag->data.s8;
- if (i_s16 < S8_MIN)
- return tag_init_s16(result, i_s16);
- if (i_s16 < 0)
- return tag_init_s8(result, i_s16);
- if (i_s16 <= U8_MAX)
- return tag_init_u8(result, i_s16);
- return tag_init_u16(result, i_s16);
+ tag_init_s16(dest, - (s16) tag->data.s8);
+ return tag_integer_reduce(dest);
case TAG_U8:
- i_s16 = - (s16) tag->data.u8;
- if (i_s16 < S8_MIN)
- return tag_init_s16(result, i_s16);
- if (i_s16 < 0)
- return tag_init_s8(result, i_s16);
- if (i_s16 <= U8_MAX)
- return tag_init_u8(result, i_s16);
- return tag_init_u16(result, i_s16);
+ tag_init_s16(dest, - (s16) tag->data.u8);
+ return tag_integer_reduce(dest);
case TAG_U16:
- return tag_init_s32(result, - (s32) tag->data.u16);
+ tag_init_s32(dest, - (s32) tag->data.u16);
+ return tag_integer_reduce(dest);
case TAG_U32:
- return tag_init_s64(result, - (s64) tag->data.u32);
+ tag_init_s64(dest, - (s64) tag->data.u32);
+ return tag_integer_reduce(dest);
case TAG_U64:
integer_init_u64(&tmp, tag->data.u64);
- result->type = TAG_INTEGER;
- integer_neg(&tmp, &result->data.integer);
+ dest->type = TAG_INTEGER;
+ integer_neg(&tmp, &dest->data.integer);
integer_clean(&tmp);
- return result;
+ return tag_integer_reduce(dest);
case TAG_UW:
integer_init_uw(&tmp, tag->data.uw);
- result->type = TAG_INTEGER;
- integer_neg(&tmp, &result->data.integer);
+ dest->type = TAG_INTEGER;
+ integer_neg(&tmp, &dest->data.integer);
integer_clean(&tmp);
- return result;
+ return tag_integer_reduce(dest);
default:
err_write_1("tag_neg: invalid tag type: ");
err_puts(tag_type_to_string(tag->type));