diff options
| author | Rickard Green <[email protected]> | 2015-11-30 18:53:32 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-11-30 18:53:32 +0100 |
| commit | fc3a963ed6f54f4b5861dc0d71e85a9d1091ff36 (patch) | |
| tree | a6af462cee123f443b947b9b59b00a38d5262a5a | |
| parent | 5851c63e9141db049699b24c77ad81d87381b059 (diff) | |
| parent | 86545dbd6f6f5a3468b919e4daf68dcdb388e80a (diff) | |
| download | otp-fc3a963ed6f54f4b5861dc0d71e85a9d1091ff36.tar.gz otp-fc3a963ed6f54f4b5861dc0d71e85a9d1091ff36.tar.bz2 otp-fc3a963ed6f54f4b5861dc0d71e85a9d1091ff36.zip | |
Merge branch 'maint'
* maint:
Remove ERTS_PRINT_INVALID from erts_print()
| -rw-r--r-- | erts/emulator/beam/sys.h | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/utils.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 90e16ca14f..2170d416c8 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -595,7 +595,6 @@ Uint erts_sys_misc_mem_sz(void); /* Io constants to erts_print and erts_putc */ #define ERTS_PRINT_STDERR (2) #define ERTS_PRINT_STDOUT (1) -#define ERTS_PRINT_INVALID (0) /* Don't want to use 0 since CBUF was 0 */ #define ERTS_PRINT_FILE (-1) #define ERTS_PRINT_SBUF (-2) #define ERTS_PRINT_SNBUF (-3) diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 184477c36b..ef851d840d 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -413,9 +413,6 @@ erts_print(int to, void *arg, char *format, ...) case ERTS_PRINT_DSBUF: res = erts_vdsprintf((erts_dsprintf_buf_t *) arg, format, arg_list); break; - case ERTS_PRINT_INVALID: - res = -EINVAL; - break; default: res = erts_vfdprintf((int) to, format, arg_list); break; |