Decouple Trap from ErrorCode

sandbox/linux/seccomp-bpf/errorcode.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/linux/seccomp-bpf/die.h"
 #include "sandbox/linux/seccomp-bpf/errorcode.h"
 
 namespace sandbox {
 
 ErrorCode::ErrorCode(int err) {
   switch (err) {
     case ERR_ALLOWED:
       err_ = SECCOMP_RET_ALLOW;
       error_type_ = ET_SIMPLE;
       break;
     case ERR_MIN_ERRNO... ERR_MAX_ERRNO:
       err_ = SECCOMP_RET_ERRNO + err;
       error_type_ = ET_SIMPLE;
       break;
     default:
       if ((err & ~SECCOMP_RET_DATA) == ERR_TRACE) {
         err_ = SECCOMP_RET_TRACE + (err & SECCOMP_RET_DATA);
         error_type_ = ET_SIMPLE;
         break;
       }
       SANDBOX_DIE("Invalid use of ErrorCode object");
   }
 }
 
-ErrorCode::ErrorCode(Trap::TrapFnc fnc, const void* aux, bool safe, uint16_t id)
+ErrorCode::ErrorCode(Trap::TrapFnc fnc, const void* aux, bool safe)
     : error_type_(ET_TRAP),
       fnc_(fnc),
       aux_(const_cast<void*>(aux)),
       safe_(safe),
-      err_(SECCOMP_RET_TRAP + id) {}
+      err_(SECCOMP_RET_TRAP + Trap::MakeTrap(fnc, aux, safe)) {
+}
 
 ErrorCode::ErrorCode(int argno,
                      ArgType width,
                      uint64_t mask,
                      uint64_t value,
                      const ErrorCode* passed,
                      const ErrorCode* failed)
     : error_type_(ET_COND),
       mask_(mask),
       value_(value),
@@ skipping 51 matching lines @@
       } else {
         return false;
       }
     } else {
       SANDBOX_DIE("Corrupted ErrorCode");
     }
   }
 }
 
 }  // namespace sandbox