Call NULL by its name
In variadic functions we still do the cast. In POSIX, it's not necessary, since NULL is required to be of type 'void *', and 'void *' is guaranteed to have the same alignment and representation as 'char *'. However, since ISO C still doesn't mandate that, and moreover they're doing dubious stuff by adding nullptr, let's be on the cautious side. Also, C++ requires that NULL is _not_ 'void *', but either plain 0 or some magic stuff. Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
committed by
Serge Hallyn
parent
1482224c54
commit
62172f6fb5
+9
-9
@@ -33,7 +33,7 @@
|
||||
* pointer if it is present.
|
||||
*/
|
||||
|
||||
for (i = 0; list[i] != (char *) 0; i++) {
|
||||
for (i = 0; list[i] != NULL; i++) {
|
||||
if (strcmp (list[i], member) == 0) {
|
||||
return list;
|
||||
}
|
||||
@@ -52,12 +52,12 @@
|
||||
* is returned to the invoker.
|
||||
*/
|
||||
|
||||
for (i = 0; list[i] != (char *) 0; i++) {
|
||||
for (i = 0; list[i] != NULL; i++) {
|
||||
tmp[i] = list[i];
|
||||
}
|
||||
|
||||
tmp[i] = xstrdup (member);
|
||||
tmp[i+1] = (char *) 0;
|
||||
tmp[i+1] = NULL;
|
||||
|
||||
return tmp;
|
||||
}
|
||||
@@ -83,7 +83,7 @@
|
||||
* pointer if it is not present.
|
||||
*/
|
||||
|
||||
for (i = j = 0; list[i] != (char *) 0; i++) {
|
||||
for (i = j = 0; list[i] != NULL; i++) {
|
||||
if (strcmp (list[i], member) != 0) {
|
||||
j++;
|
||||
}
|
||||
@@ -106,14 +106,14 @@
|
||||
* is returned to the invoker.
|
||||
*/
|
||||
|
||||
for (i = j = 0; list[i] != (char *) 0; i++) {
|
||||
for (i = j = 0; list[i] != NULL; i++) {
|
||||
if (strcmp (list[i], member) != 0) {
|
||||
tmp[j] = list[i];
|
||||
j++;
|
||||
}
|
||||
}
|
||||
|
||||
tmp[j] = (char *) 0;
|
||||
tmp[j] = NULL;
|
||||
|
||||
return tmp;
|
||||
}
|
||||
@@ -142,7 +142,7 @@
|
||||
list++;
|
||||
}
|
||||
|
||||
tmp[i] = (char *) 0;
|
||||
tmp[i] = NULL;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@ bool is_on_list (char *const *list, const char *member)
|
||||
*/
|
||||
|
||||
if ('\0' == *members) {
|
||||
*array = (char *) 0;
|
||||
*array = NULL;
|
||||
free (members);
|
||||
return array;
|
||||
}
|
||||
@@ -235,7 +235,7 @@ bool is_on_list (char *const *list, const char *member)
|
||||
cp2++;
|
||||
cp = cp2;
|
||||
} else {
|
||||
array[i + 1] = (char *) 0;
|
||||
array[i + 1] = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user