RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-02-28 07:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

newrole: silence compiler warnings

Browse Source 
newrole.c:636:12: warning: function declaration isn’t a prototype [-Wstrict-prototypes]
      636 | static int transition_to_caller_uid()
          |            ^~~~~~~~~~~~~~~~~~~~~~~~

    newrole.c:103:9: warning: macro is not used [-Wunused-macros]
    #define DEFAULT_CONTEXT_SIZE 255        /* first guess at context size */
            ^

    newrole.c:862:4: warning: 'break' will never be executed [-Wunreachable-code-break]
                            break;
                            ^~~~~

    newrole.c:168:13: warning: no previous extern declaration for non-static variable 'service_name' [-Wmissing-variable-declarations]
    const char *service_name = "newrole";
                ^

    hashtab.c:53:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
            hvalue = h->hash_value(h, key);
                   ~ ^~~~~~~~~~~~~~~~~~~~~
    hashtab.c:92:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
            hvalue = h->hash_value(h, key);
                   ~ ^~~~~~~~~~~~~~~~~~~~~
    hashtab.c:124:11: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
            hvalue = h->hash_value(h, key);
                   ~ ^~~~~~~~~~~~~~~~~~~~~
    hashtab.c:172:10: warning: implicit conversion changes signedness: 'int' to 'unsigned int' [-Wsign-conversion]
                            ret = apply(cur->key, cur->datum, args);
                                ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    hashtab.c:174:12: warning: implicit conversion changes signedness: 'unsigned int' to 'int' [-Wsign-conversion]
                                    return ret;
                                    ~~~~~~ ^~~

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2022-02-22 14:51:41 +01:00 committed by James Carter
parent 09c994c287
commit 29e167a448
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
policycoreutils/newrole/hashtab.c
View File

@ -44,7 +44,7 @@ hashtab_t hashtab_create(unsigned int (*hash_value) (hashtab_t h,
int hashtab_insert(hashtab_t h, hashtab_key_t key, hashtab_datum_t datum) int hashtab_insert(hashtab_t h, hashtab_key_t key, hashtab_datum_t datum)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t prev, cur, newnode; hashtab_ptr_t prev, cur, newnode;
if (!h) if (!h)
@ -83,7 +83,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
void (*destroy) (hashtab_key_t k, void (*destroy) (hashtab_key_t k,
hashtab_datum_t d, void *args), void *args) hashtab_datum_t d, void *args), void *args)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t cur, last; hashtab_ptr_t cur, last;
if (!h) if (!h)
@ -115,7 +115,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
hashtab_datum_t hashtab_search(hashtab_t h, const_hashtab_key_t key) hashtab_datum_t hashtab_search(hashtab_t h, const_hashtab_key_t key)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t cur; hashtab_ptr_t cur;
if (!h) if (!h)
@ -160,8 +160,9 @@ int hashtab_map(hashtab_t h,
int (*apply) (hashtab_key_t k, int (*apply) (hashtab_key_t k,
hashtab_datum_t d, void *args), void *args) hashtab_datum_t d, void *args), void *args)
{ {
unsigned int i, ret; unsigned int i;
hashtab_ptr_t cur; hashtab_ptr_t cur;
int ret;
if (!h) if (!h)
return HASHTAB_SUCCESS; return HASHTAB_SUCCESS;

15
policycoreutils/newrole/newrole.c
View File

@ -100,7 +100,6 @@
#endif #endif
#define DEFAULT_PATH "/usr/bin:/bin" #define DEFAULT_PATH "/usr/bin:/bin"
#define DEFAULT_CONTEXT_SIZE 255 /* first guess at context size */
extern char **environ; extern char **environ;
@ -115,7 +114,7 @@ extern char **environ;
* *
* Returns malloc'd memory * Returns malloc'd memory
*/ */
static char *build_new_range(char *newlevel, const char *range) static char *build_new_range(const char *newlevel, const char *range)
{ {
char *newrangep = NULL; char *newrangep = NULL;
const char *tmpptr; const char *tmpptr;
@ -166,7 +165,7 @@ static char *build_new_range(char *newlevel, const char *range)
#include <security/pam_appl.h> /* for PAM functions */ #include <security/pam_appl.h> /* for PAM functions */
#include <security/pam_misc.h> /* for misc_conv PAM utility function */ #include <security/pam_misc.h> /* for misc_conv PAM utility function */
const char *service_name = "newrole"; static const char *service_name = "newrole";
/* authenticate_via_pam() /* authenticate_via_pam()
* *
@ -230,14 +229,13 @@ static int free_hashtab_entry(hashtab_key_t key, hashtab_datum_t d,
static unsigned int reqsymhash(hashtab_t h, const_hashtab_key_t key) static unsigned int reqsymhash(hashtab_t h, const_hashtab_key_t key)
{ {
char *p, *keyp; const char *p;
size_t size; size_t size;
unsigned int val; unsigned int val;
val = 0; val = 0;
keyp = (char *)key; size = strlen(key);
size = strlen(keyp); for (p = key; ((size_t) (p - key)) < size; p++)
for (p = keyp; ((size_t) (p - keyp)) < size; p++)
val = val =
(val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^ (*p); (val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^ (*p);
return val & (h->size - 1); return val & (h->size - 1);
@ -623,7 +621,7 @@ static inline int drop_capabilities(__attribute__ ((__unused__)) int full)
* This function will set the uid values to be that of caller's uid, and * This function will set the uid values to be that of caller's uid, and
* will drop any privilege which may have been raised. * will drop any privilege which may have been raised.
*/ */
static int transition_to_caller_uid() static int transition_to_caller_uid(void)
{ {
uid_t uid = getuid(); uid_t uid = getuid();
@ -850,7 +848,6 @@ static int parse_command_line_arguments(int argc, char **argv, char *ttyn,
case 'V': case 'V':
printf("newrole: %s version %s\n", PACKAGE, VERSION); printf("newrole: %s version %s\n", PACKAGE, VERSION);
exit(0); exit(0);
break;
case 'p': case 'p':
*preserve_environment = 1; *preserve_environment = 1;
break; break;