From: Christian Göttsche Date: Fri, 5 Aug 2022 15:40:36 +0000 (+0200) Subject: Drop superfluous const from return type X-Git-Tag: 4.12~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d5a54ba0cdb1784bfa096f8660657b7c2697d7;p=thirdparty%2Fshadow.git Drop superfluous const from return type salt.c:102:22: warning: type qualifiers ignored on function return type [-Wignored-qualifiers] 102 | static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *prefered_rounds); | ^~~~~ salt.c:110:22: warning: type qualifiers ignored on function return type [-Wignored-qualifiers] 110 | static /*@observer@*/const unsigned long YESCRYPT_get_salt_cost (/*@null@*/int *prefered_cost); | ^~~~~ subordinateio.c:160:8: warning: type qualifiers ignored on function return type [-Wignored-qualifiers] 160 | static const bool range_exists(struct commonio_db *db, const char *owner) | ^~~~~ --- diff --git a/lib/subordinateio.c b/lib/subordinateio.c index 6bc452835..bd1af26b4 100644 --- a/lib/subordinateio.c +++ b/lib/subordinateio.c @@ -157,7 +157,7 @@ static struct commonio_ops subordinate_ops = { * * Returns true if @owner owns any subuid ranges, false otherwise. */ -static const bool range_exists(struct commonio_db *db, const char *owner) +static bool range_exists(struct commonio_db *db, const char *owner) { const struct subordinate_range *range; commonio_rewind(db); diff --git a/libmisc/salt.c b/libmisc/salt.c index 1279ca09f..e5f633ab9 100644 --- a/libmisc/salt.c +++ b/libmisc/salt.c @@ -99,15 +99,15 @@ static /*@observer@*/const char *gensalt (size_t salt_size); static long shadow_random (long min, long max); #endif /* USE_SHA_CRYPT || USE_BCRYPT */ #ifdef USE_SHA_CRYPT -static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *prefered_rounds); +static /*@observer@*/unsigned long SHA_get_salt_rounds (/*@null@*/const int *prefered_rounds); static /*@observer@*/void SHA_salt_rounds_to_buf (char *buf, unsigned long rounds); #endif /* USE_SHA_CRYPT */ #ifdef USE_BCRYPT -static /*@observer@*/const unsigned long BCRYPT_get_salt_rounds (/*@null@*/int *prefered_rounds); +static /*@observer@*/unsigned long BCRYPT_get_salt_rounds (/*@null@*/const int *prefered_rounds); static /*@observer@*/void BCRYPT_salt_rounds_to_buf (char *buf, unsigned long rounds); #endif /* USE_BCRYPT */ #ifdef USE_YESCRYPT -static /*@observer@*/const unsigned long YESCRYPT_get_salt_cost (/*@null@*/int *prefered_cost); +static /*@observer@*/unsigned long YESCRYPT_get_salt_cost (/*@null@*/const int *prefered_cost); static /*@observer@*/void YESCRYPT_salt_cost_to_buf (char *buf, unsigned long cost); #endif /* USE_YESCRYPT */ @@ -221,7 +221,7 @@ static long shadow_random (long min, long max) #ifdef USE_SHA_CRYPT /* Return the the rounds number for the SHA crypt methods. */ -static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *prefered_rounds) +static /*@observer@*/unsigned long SHA_get_salt_rounds (/*@null@*/const int *prefered_rounds) { unsigned long rounds; @@ -295,7 +295,7 @@ static /*@observer@*/void SHA_salt_rounds_to_buf (char *buf, unsigned long round #ifdef USE_BCRYPT /* Return the the rounds number for the BCRYPT method. */ -static /*@observer@*/const unsigned long BCRYPT_get_salt_rounds (/*@null@*/int *prefered_rounds) +static /*@observer@*/unsigned long BCRYPT_get_salt_rounds (/*@null@*/const int *prefered_rounds) { unsigned long rounds; @@ -374,7 +374,7 @@ static /*@observer@*/void BCRYPT_salt_rounds_to_buf (char *buf, unsigned long ro #ifdef USE_YESCRYPT /* Return the the cost number for the YESCRYPT method. */ -static /*@observer@*/const unsigned long YESCRYPT_get_salt_cost (/*@null@*/int *prefered_cost) +static /*@observer@*/unsigned long YESCRYPT_get_salt_cost (/*@null@*/const int *prefered_cost) { unsigned long cost;