summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-07-05 08:35:07 +0300
committerDan McDonald <danmcd@joyent.com>2017-07-25 14:53:12 -0400
commit2bee374f9ad3367948d472f4e3489135fcac9e1c (patch)
tree5c854880ed7e73f8c25fec6a1d1a35bfa1ed7f20 /usr/src
parent3344ffb75c0f6746eb694e4389f752801e9c7a4e (diff)
downloadillumos-gate-2bee374f9ad3367948d472f4e3489135fcac9e1c.tar.gz
8464 audioconvert: cannot convert 'std::nullptr_t' to 'char' in assignment
Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/audio/audioconvert/parse.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/cmd/audio/audioconvert/parse.cc b/usr/src/cmd/audio/audioconvert/parse.cc
index b5901b19f4..0294b77050 100644
--- a/usr/src/cmd/audio/audioconvert/parse.cc
+++ b/usr/src/cmd/audio/audioconvert/parse.cc
@@ -24,8 +24,6 @@
* All rights reserved.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -173,7 +171,7 @@ parse_format(
// If so, left side is keyword, right side is value.
// If not, entire string is value.
if (cp2 = strchr(cp, '=')) {
- *cp2++ = NULL;
+ *cp2++ = '\0';
key = cp;
val = cp2;