summaryrefslogtreecommitdiff
path: root/i/marvin/src/proto/proto.cc
diff options
context:
space:
mode:
authorschodet2006-05-21 00:24:46 +0000
committerschodet2006-05-21 00:24:46 +0000
commitcd5fd2efaa1867932daf467ed7a64f4928e3578a (patch)
treeaa4e50663a818e2f18f02662157304b7dfa549fd /i/marvin/src/proto/proto.cc
parentd4e8419d9c25bc2a2a63e3ef3572533ac7651c48 (diff)
Bouh, l'horible bug.
Diffstat (limited to 'i/marvin/src/proto/proto.cc')
-rw-r--r--i/marvin/src/proto/proto.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/i/marvin/src/proto/proto.cc b/i/marvin/src/proto/proto.cc
index 3569a47..07a6634 100644
--- a/i/marvin/src/proto/proto.cc
+++ b/i/marvin/src/proto/proto.cc
@@ -170,7 +170,6 @@ bool
Proto::decode (const Frame &frame, const char *format, int &a0,
int &a1, int &a2)
{
-
int dummy;
return decode(frame, format, a0, a1, a2, dummy);
}
@@ -398,12 +397,15 @@ Proto::decodeArg(const Frame & frame, const char *format, int &a0, int &a1, int
break;
case 'D':
- int8_t t = static_cast<int8_t>(frame.args[pos]);
- temp[i] = static_cast<int>(t) << 24
- |static_cast<int>(frame.args[pos + 1]) << 16
- |static_cast<int>(frame.args[pos + 2]) << 8
- |static_cast<int>(frame.args[pos + 3]);
- break;
+ {
+ int8_t t = static_cast<int8_t>(frame.args[pos]);
+ temp[i] = static_cast<int>(t) << 24
+ |static_cast<int>(frame.args[pos + 1]) << 16
+ |static_cast<int>(frame.args[pos + 2]) << 8
+ |static_cast<int>(frame.args[pos + 3]);
+ pos += 4;
+ break;
+ }
}
}
a0 = temp[0];