Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/public/cpp/bindings/lib/validation_errors.h" | 5 #include "mojo/public/cpp/bindings/lib/validation_errors.h" |
| 6 | 6 |
| 7 #include <assert.h> | 7 #include <assert.h> |
| 8 #include <stdio.h> | 8 |
| 9 #include "mojo/public/cpp/environment/logging.h" | |
| 9 | 10 |
| 10 namespace mojo { | 11 namespace mojo { |
| 11 namespace internal { | 12 namespace internal { |
| 12 namespace { | 13 namespace { |
| 13 | 14 |
| 14 ValidationErrorObserverForTesting* g_validation_error_observer = NULL; | 15 ValidationErrorObserverForTesting* g_validation_error_observer = NULL; |
| 15 | 16 |
| 16 } // namespace | 17 } // namespace |
| 17 | 18 |
| 18 const char* ValidationErrorToString(ValidationError error) { | 19 const char* ValidationErrorToString(ValidationError error) { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 34 case VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAG_COMBINATION: | 35 case VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAG_COMBINATION: |
| 35 return "VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAG_COMBINATION"; | 36 return "VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAG_COMBINATION"; |
| 36 case VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID: | 37 case VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID: |
| 37 return "VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID"; | 38 return "VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID"; |
| 38 } | 39 } |
| 39 | 40 |
| 40 return "Unknown error"; | 41 return "Unknown error"; |
| 41 } | 42 } |
| 42 | 43 |
| 43 void ReportValidationError(ValidationError error) { | 44 void ReportValidationError(ValidationError error) { |
| 44 if (g_validation_error_observer) { | 45 if (g_validation_error_observer) { |
|
viettrungluu
2014/06/20 01:11:18
FWIW, you can get rid of the braces if you feel li
yzshen1
2014/06/20 05:41:24
Done.
| |
| 45 g_validation_error_observer->set_last_error(error); | 46 g_validation_error_observer->set_last_error(error); |
| 46 } else { | 47 } else { |
| 47 // TODO(yzshen): Consider adding better logging support. | 48 MOJO_LOG(ERROR) << "Invalid message: " << ValidationErrorToString(error); |
| 48 fprintf(stderr, "Invalid message: %s\n", ValidationErrorToString(error)); | |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 | 51 |
| 52 ValidationErrorObserverForTesting::ValidationErrorObserverForTesting() | 52 ValidationErrorObserverForTesting::ValidationErrorObserverForTesting() |
| 53 : last_error_(VALIDATION_ERROR_NONE) { | 53 : last_error_(VALIDATION_ERROR_NONE) { |
| 54 assert(!g_validation_error_observer); | 54 assert(!g_validation_error_observer); |
| 55 g_validation_error_observer = this; | 55 g_validation_error_observer = this; |
| 56 } | 56 } |
| 57 | 57 |
| 58 ValidationErrorObserverForTesting::~ValidationErrorObserverForTesting() { | 58 ValidationErrorObserverForTesting::~ValidationErrorObserverForTesting() { |
| 59 assert(g_validation_error_observer == this); | 59 assert(g_validation_error_observer == this); |
| 60 g_validation_error_observer = NULL; | 60 g_validation_error_observer = NULL; |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace internal | 63 } // namespace internal |
| 64 } // namespace mojo | 64 } // namespace mojo |
| OLD | NEW |