|
5 | 5 | "fmt"
|
6 | 6 | )
|
7 | 7 |
|
| 8 | +const errorExtID = 3 |
| 9 | + |
8 | 10 | const (
|
9 | 11 | keyErrorStack = 0x00
|
10 | 12 | keyErrorType = 0x00
|
@@ -167,25 +169,132 @@ func decodeBoxError(d *decoder) (*BoxError, error) {
|
167 | 169 | return &errorStack[0], nil
|
168 | 170 | }
|
169 | 171 |
|
| 172 | +func encodeBoxError(enc *encoder, boxError *BoxError) error { |
| 173 | + if boxError == nil { |
| 174 | + return fmt.Errorf("msgpack: unexpected nil BoxError on encode") |
| 175 | + } |
| 176 | + |
| 177 | + if err := enc.EncodeMapLen(1); err != nil { |
| 178 | + return err |
| 179 | + } |
| 180 | + if err := encodeUint(enc, keyErrorStack); err != nil { |
| 181 | + return err |
| 182 | + } |
| 183 | + |
| 184 | + var stackDepth = boxError.Depth() |
| 185 | + if err := enc.EncodeArrayLen(stackDepth); err != nil { |
| 186 | + return err |
| 187 | + } |
| 188 | + |
| 189 | + for ; stackDepth > 0; stackDepth-- { |
| 190 | + fieldsLen := len(boxError.Fields) |
| 191 | + |
| 192 | + if fieldsLen > 0 { |
| 193 | + if err := enc.EncodeMapLen(7); err != nil { |
| 194 | + return err |
| 195 | + } |
| 196 | + } else { |
| 197 | + if err := enc.EncodeMapLen(6); err != nil { |
| 198 | + return err |
| 199 | + } |
| 200 | + } |
| 201 | + |
| 202 | + if err := encodeUint(enc, keyErrorType); err != nil { |
| 203 | + return err |
| 204 | + } |
| 205 | + if err := enc.EncodeString(boxError.Type); err != nil { |
| 206 | + return err |
| 207 | + } |
| 208 | + |
| 209 | + if err := encodeUint(enc, keyErrorFile); err != nil { |
| 210 | + return err |
| 211 | + } |
| 212 | + if err := enc.EncodeString(boxError.File); err != nil { |
| 213 | + return err |
| 214 | + } |
| 215 | + |
| 216 | + if err := encodeUint(enc, keyErrorLine); err != nil { |
| 217 | + return err |
| 218 | + } |
| 219 | + if err := enc.EncodeUint64(boxError.Line); err != nil { |
| 220 | + return err |
| 221 | + } |
| 222 | + |
| 223 | + if err := encodeUint(enc, keyErrorMessage); err != nil { |
| 224 | + return err |
| 225 | + } |
| 226 | + if err := enc.EncodeString(boxError.Msg); err != nil { |
| 227 | + return err |
| 228 | + } |
| 229 | + |
| 230 | + if err := encodeUint(enc, keyErrorErrno); err != nil { |
| 231 | + return err |
| 232 | + } |
| 233 | + if err := enc.EncodeUint64(boxError.Errno); err != nil { |
| 234 | + return err |
| 235 | + } |
| 236 | + |
| 237 | + if err := encodeUint(enc, keyErrorErrcode); err != nil { |
| 238 | + return err |
| 239 | + } |
| 240 | + if err := enc.EncodeUint64(boxError.Code); err != nil { |
| 241 | + return err |
| 242 | + } |
| 243 | + |
| 244 | + if fieldsLen > 0 { |
| 245 | + if err := encodeUint(enc, keyErrorFields); err != nil { |
| 246 | + return err |
| 247 | + } |
| 248 | + |
| 249 | + if err := enc.EncodeMapLen(fieldsLen); err != nil { |
| 250 | + return err |
| 251 | + } |
| 252 | + |
| 253 | + for k, v := range boxError.Fields { |
| 254 | + if err := enc.EncodeString(k); err != nil { |
| 255 | + return err |
| 256 | + } |
| 257 | + if err := enc.Encode(v); err != nil { |
| 258 | + return err |
| 259 | + } |
| 260 | + } |
| 261 | + } |
| 262 | + |
| 263 | + if stackDepth > 1 { |
| 264 | + boxError = boxError.Prev |
| 265 | + } |
| 266 | + } |
| 267 | + |
| 268 | + return nil |
| 269 | +} |
| 270 | + |
170 | 271 | // UnmarshalMsgpack deserializes a BoxError value from a MessagePack
|
171 | 272 | // representation.
|
172 | 273 | func (e *BoxError) UnmarshalMsgpack(b []byte) error {
|
173 |
| - var val *BoxError |
174 |
| - var err error |
175 |
| - |
176 | 274 | buf := bytes.NewBuffer(b)
|
177 | 275 | dec := newDecoder(buf)
|
178 | 276 |
|
179 |
| - if val, err = decodeBoxError(dec); err != nil { |
| 277 | + if val, err := decodeBoxError(dec); err != nil { |
180 | 278 | return err
|
181 |
| - } |
182 |
| - |
183 |
| - if val != nil { |
| 279 | + } else { |
184 | 280 | if e == nil {
|
185 | 281 | e = &BoxError{}
|
186 | 282 | }
|
| 283 | + |
187 | 284 | *e = *val
|
| 285 | + |
| 286 | + return nil |
188 | 287 | }
|
| 288 | +} |
189 | 289 |
|
190 |
| - return nil |
| 290 | +// MarshalMsgpack serializes the BoxError into a MessagePack representation. |
| 291 | +func (e *BoxError) MarshalMsgpack() ([]byte, error) { |
| 292 | + var buf bytes.Buffer |
| 293 | + |
| 294 | + enc := newEncoder(&buf) |
| 295 | + if err := encodeBoxError(enc, e); err != nil { |
| 296 | + return nil, err |
| 297 | + } |
| 298 | + |
| 299 | + return buf.Bytes(), nil |
191 | 300 | }
|
0 commit comments