From 00d1ab6454b4748b4bffaff8eb29c265b7aaeca2 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 30 Jul 2011 01:41:03 +0000 Subject: [PATCH] * src/usermod.c: Add annotations to indicate that fail_exit() does not return. * src/usermod.c: Fix typo in notreached annotation. --- ChangeLog | 6 ++++++ src/usermod.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 964cd958..04cb863f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-07-30 Nicolas François + + * src/usermod.c: Add annotations to indicate that fail_exit() does + not return. + * src/usermod.c: Fix typo in notreached annotation. + 2011-07-30 Nicolas François * libmisc/find_new_uid.c: free (used_uids) on return. diff --git a/src/usermod.c b/src/usermod.c index 16092e2a..12d20184 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -159,7 +159,7 @@ static void selinux_update_mapping (void); #endif static void new_spent (struct spwd *); -static void fail_exit (int); +static /*@noreturn@*/void fail_exit (int); static void update_group (void); #ifdef SHADOWGRP @@ -557,7 +557,7 @@ static void new_spent (struct spwd *spent) /* * fail_exit - exit with an error code after unlocking files */ -static void fail_exit (int code) +static /*@noreturn@*/void fail_exit (int code) { if (gr_locked) { if (gr_unlock () == 0) { @@ -967,7 +967,7 @@ static void process_flags (int argc, char **argv) break; case 'h': usage (E_SUCCESS); - /* @notreached@ */break; + /*@notreached@*/break; case 'l': if (!is_valid_user_name (optarg)) { fprintf (stderr,