assert() only prevents -Wreturn-type from firing if asserts are
enabled. Use abort() so we don't do unexpected things even if we use
-UNDEBUG.
From b53ad041daa53f511baccc860b6fe6993590aa87 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@xxxxxxxxxx>
Date: Wed, 10 Jun 2015 17:01:23 -0700
Subject: [PATCH] Fix -Wreturn-type issues.
To: selinux@xxxxxxxxxxxxx
Cc: nnk@xxxxxxxxxx,
sds@xxxxxxxxxxxxx
assert() only prevents -Wreturn-type from firing if asserts are
enabled. Use abort() so we don't do unexpected things even if we use
-UNDEBUG.
---
checkpolicy/module_compiler.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/checkpolicy/module_compiler.c b/checkpolicy/module_compiler.c
index d7f27f5..6e5483c 100644
--- a/checkpolicy/module_compiler.c
+++ b/checkpolicy/module_compiler.c
@@ -300,7 +300,7 @@ role_datum_t *declare_role(unsigned char isattr)
return dest_role; /* role already declared for this block */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -363,7 +363,7 @@ type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
return typdatum;
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -499,7 +499,7 @@ user_datum_t *declare_user(void)
return dest_user; /* user already declared for this block */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -804,7 +804,7 @@ int require_class(int pass)
break;
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
@@ -917,7 +917,7 @@ static int require_role_or_attribute(int pass, unsigned char isattr)
return 0; /* role already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -980,7 +980,7 @@ static int require_type_or_attribute(int pass, unsigned char isattr)
return 0; /* type already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1041,7 +1041,7 @@ int require_user(int pass)
return 0; /* user already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1092,7 +1092,7 @@ static int require_bool_tunable(int pass, int is_tunable)
return 0; /* boolean already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1165,7 +1165,7 @@ int require_sens(int pass)
return 0; /* sensitivity already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1218,7 +1218,7 @@ int require_cat(int pass)
return 0; /* category already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
--
2.2.0.rc0.207.ga3a616c
_______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
