summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-05-01 11:47:45 +0300
committerRobert Mustacchi <rm@joyent.com>2017-05-08 15:42:27 +0000
commit132157d7fb25c120ae1deca2a65fa7c78e8fcfd0 (patch)
treee9da2d1225bbf196c5a630e7c86290181c147f38
parentc160bf3613805cfb4a89a0433ae896d3594f551f (diff)
downloadillumos-joyent-132157d7fb25c120ae1deca2a65fa7c78e8fcfd0.tar.gz
8135 libfru: char Str::tokenize should return NUL char, not NULL pointer
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com> Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Alexander Pyhalov <apyhalov@gmail.com> Reviewed by: Aurélien Larcher <aurelien.larcher@gmail.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/lib/libfru/libgenutil/Str.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/lib/libfru/libgenutil/Str.cc b/usr/src/lib/libfru/libgenutil/Str.cc
index f78e4ee93c..bcccdf4fcd 100644
--- a/usr/src/lib/libfru/libgenutil/Str.cc
+++ b/usr/src/lib/libfru/libgenutil/Str.cc
@@ -24,8 +24,6 @@
* All rights reserved.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <string.h>
#include <stdio.h>
@@ -171,7 +169,7 @@ Str::tokenize(Str& token, const Str& separators, Str& remainder)
remainder = nextTok_;
// remainder = *this;
// did not find it!
- return (NULL);
+ return ('\0');
}
void