diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 15:32:06 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 15:32:06 +0200 |
| commit | 4d3672766e6b9c2ec70768706a893486010e0157 (patch) | |
| tree | 54e8e395f54443d59dd272ee32c44bd3c1421b23 /erts/epmd | |
| parent | 1018f21841111f0f859bd3531e32773cc7dfcd1f (diff) | |
| parent | 8e70bbb3a94b09600bf7ac9d3b18713502a64625 (diff) | |
| download | otp-4d3672766e6b9c2ec70768706a893486010e0157.tar.gz otp-4d3672766e6b9c2ec70768706a893486010e0157.tar.bz2 otp-4d3672766e6b9c2ec70768706a893486010e0157.zip | |
Merge branch 'egil/license-compliance/OTP-12848'
* egil/license-compliance/OTP-12848:
Revert "lcnt: Let runq locks reflect actual call location"
Revert "Demote rare debug slogan of message discarding to debug build"
Revert "Add missing error string to syslog logging in epmd"
Revert "Add run queue index to process dump info"
Revert "Add thread index to allocator enomem dump slogan"
Revert "Add number of entries to mnesia copy debug message"
Diffstat (limited to 'erts/epmd')
| -rw-r--r-- | erts/epmd/src/epmd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c index 447aae47aa..2fd9845d1a 100644 --- a/erts/epmd/src/epmd.c +++ b/erts/epmd/src/epmd.c @@ -498,11 +498,7 @@ static void dbg_gen_printf(int onsyslog,int perr,int from_level, #ifdef HAVE_SYSLOG_H if (onsyslog) { - int len; - len = erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args); - if (perr != 0 && len < sizeof(buf)) { - erts_snprintf(buf+len, sizeof(buf)-len, ": %s", strerror(perr)); - } + erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args); syslog(LOG_ERR,"epmd: %s",buf); } #endif |