Declare deny/allow as noreturn

git-core · git-core · commit fcd02a707856 · 2012-07-26T14:18:04.000+04:00
diff --git a/su.c b/su.c
@@ -300,7 +300,7 @@ static void usage(int status)
     exit(status);
 }
 
-static void deny(const struct su_context *ctx)
+static __attribute__ ((noreturn)) void deny(const struct su_context *ctx)
 {
     char *cmd = get_command(&ctx->to);
 
@@ -310,7 +310,7 @@ static void deny(const struct su_context *ctx)
     exit(EXIT_FAILURE);
 }
 
-static void allow(const struct su_context *ctx)
+static __attribute__ ((noreturn)) void allow(const struct su_context *ctx)
 {
     char *arg0;
     int argc, err;
@@ -611,7 +611,4 @@ int main(int argc, char *argv[])
         LOGE("unknown response from Superuser Requestor: %s", result);
         deny(&ctx);
     }
-
-    deny(&ctx);
-    return -1;
 }

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ static void usage(int status)`
`300`	`300`	`exit(status);`
`301`	`301`	`}`
`302`	`302`
`303`		`-static void deny(const struct su_context *ctx)`
	`303`	`+static __attribute__ ((noreturn)) void deny(const struct su_context *ctx)`
`304`	`304`	`{`
`305`	`305`	`char *cmd = get_command(&ctx->to);`
`306`	`306`
`@@ -310,7 +310,7 @@ static void deny(const struct su_context *ctx)`
`310`	`310`	`exit(EXIT_FAILURE);`
`311`	`311`	`}`
`312`	`312`
`313`		`-static void allow(const struct su_context *ctx)`
	`313`	`+static __attribute__ ((noreturn)) void allow(const struct su_context *ctx)`
`314`	`314`	`{`
`315`	`315`	`char *arg0;`
`316`	`316`	`int argc, err;`
`@@ -611,7 +611,4 @@ int main(int argc, char *argv[])`
`611`	`611`	`LOGE("unknown response from Superuser Requestor: %s", result);`
`612`	`612`	`deny(&ctx);`
`613`	`613`	`}`
`614`		`-`
`615`		`- deny(&ctx);`
`616`		`- return -1;`
`617`	`614`	`}`