Fix -Wreturn-type issues.
--089e013a1a2abb8ecf0518469d04
Content-Type: text/plain; charset=UTF-8
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.
<div dir="ltr"><div>assert() only prevents -Wreturn-type from firing if asserts are</div><div>enabled. Use abort() so we don't do unexpected things even if we use</div><div>-UNDEBUG.</div></div>
From b53ad041daa53f511baccc860b6fe6993590aa87 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 10 Jun 2015 17:01:23 -0700
Subject: [PATCH] Fix -Wreturn-type issues.
To: selinux@tycho.nsa.gov
Cc: nnk@google.com,
sds@tycho.nsa.gov
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.
(cherry picked from commit 93b2e5fa0763425f950598442a91fcab9314094b)
Change-Id: I271a0d10470a4479f81402a8bedd68a3e24d9466
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 @@
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 @@
return typdatum;
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -499,7 +499,7 @@
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 @@
break;
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
@@ -917,7 +917,7 @@
return 0; /* role already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -980,7 +980,7 @@
return 0; /* type already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1041,7 +1041,7 @@
return 0; /* user already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1092,7 +1092,7 @@
return 0; /* boolean already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1165,7 +1165,7 @@
return 0; /* sensitivity already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
@@ -1218,7 +1218,7 @@
return 0; /* category already required */
}
default:{
- assert(0); /* should never get here */
+ abort(); /* should never get here */
}
}
}
