summaryrefslogtreecommitdiff
path: root/hald/solaris
diff options
context:
space:
mode:
Diffstat (limited to 'hald/solaris')
-rw-r--r--hald/solaris/probing/printer.c2
-rw-r--r--hald/solaris/probing/probe-snmp.c2
-rw-r--r--hald/solaris/probing/probe-storage.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/hald/solaris/probing/printer.c b/hald/solaris/probing/printer.c
index da4425ab..a0b06e61 100644
--- a/hald/solaris/probing/printer.c
+++ b/hald/solaris/probing/printer.c
@@ -30,7 +30,7 @@ strip_ws(char *s)
char *p;
/* skip the leading whitespace */
- for (; ((*s != NULL) && (isspace(*s) != 0)); s++);
+ for (; ((*s != '\0') && (isspace(*s) != 0)); s++);
/* drop the trailing whitespace */
for (p = s + strlen(s) - 1; ((p > s) && (isspace(*p) != 0));
diff --git a/hald/solaris/probing/probe-snmp.c b/hald/solaris/probing/probe-snmp.c
index 6fb8bb72..0548aa24 100644
--- a/hald/solaris/probing/probe-snmp.c
+++ b/hald/solaris/probing/probe-snmp.c
@@ -40,7 +40,7 @@ hrDeviceDesc_to_info(char *string, char **manufacturer, char **model,
*description = strdup(string);
*manufacturer = strdup(string);
if ((s = strchr(*manufacturer, ' ')) != NULL) {
- *s++ = NULL;
+ *s++ = '\0';
*model = strdup(s);
}
}
diff --git a/hald/solaris/probing/probe-storage.c b/hald/solaris/probing/probe-storage.c
index d274aa93..123d7e46 100644
--- a/hald/solaris/probing/probe-storage.c
+++ b/hald/solaris/probing/probe-storage.c
@@ -268,7 +268,7 @@ check_floppy(int fd, dbus_bool_t *wprot)
int chg;
if ((ioctl(fd, FDGETCHANGE, &chg) == 0) && !(chg & FDGC_CURRENT)) {
- *wprot = ((chg & FDGC_CURWPROT) != NULL);
+ *wprot = ((chg & FDGC_CURWPROT) != 0);
return (TRUE);
} else {
return (FALSE);