diff -Naurp --exclude-from excludes old/libsemanage/src/parse_utils.c new/libsemanage/src/parse_utils.c
--- old/libsemanage/src/parse_utils.c	2006-01-05 12:49:15.000000000 -0500
+++ new/libsemanage/src/parse_utils.c	2006-02-10 16:33:29.000000000 -0500
@@ -217,23 +217,24 @@ int parse_assert_str(
 }
 
 int parse_optional_ch(parse_info_t* info, const char ch) {
-	if (info->ptr && (*(info->ptr) != ch))
+
+	if (!info->ptr)
 		return STATUS_NODATA;
-	else {
-		info->ptr++;
-		return STATUS_SUCCESS;
-	}
+	if (*(info->ptr) != ch)
+		return STATUS_NODATA;
+		
+	info->ptr++;
+	return STATUS_SUCCESS;
 }
 
 int parse_optional_str(parse_info_t* info, const char* str) {
 	size_t len = strlen(str);
 
-	if (info->ptr && strncmp(info->ptr, str, len))
+	if (strncmp(info->ptr, str, len))
 		return STATUS_NODATA;
-	else {
-		info->ptr += len;
-		return STATUS_SUCCESS;
-	}
+
+	info->ptr += len;
+	return STATUS_SUCCESS;
 }
 
 int parse_fetch_int(