Commit Graph

8 Commits

Author SHA1 Message Date
Chris PeBenito
3937946900 Update to libsepol 2.4 parser.
There was a struct change internally. Now setools4 requires libsepol 2.4.
2015-02-04 14:34:47 -05:00
Fernand Lone-Sang
bc081bbccd Fixed -Werror=unused-but-set-variable in libqpol/policy_extend.c 2015-01-23 15:23:38 +01:00
Fernand Lone-Sang
6a8dbe88a5 Fixed -Werror=unused-variable in libqpol/policy_extend.c 2015-01-23 15:23:32 +01:00
Nicolas Iooss
edca1ac4c7 Treat literal strings as constant
Literal strings are located in read-only memory and should be "const
char*".  "gcc -Wwrite-strings" warns when using non-const literal
strings with messages like:

    libqpol/policy_parse.y: In function 'yyparse':
    libqpol/policy_parse.y:381:21: warning: passing argument 1 of
    'insert_id' discards 'const' qualifier from pointer target type
         { if (insert_id("T",0)) return -1; }
                     ^

Fix these warnings by using "const char*" instead of "char*" for some
function parameters.

This makes gcc report other warnings about hashtab_search (from
libsepol).  This function incorrectly defines its second parameter as
"char *const key" instead of "const char* key" (this fact is hidden
behind hashtab_key_t typedef).
2014-11-02 13:02:59 -05:00
Nicolas Iooss
2994d1ca1d Cast the 2nd parameter of hashtab_search to hashtab_key_t
"gcc -Wwrite-strings" reported warnings when using hashtab_search (from
libsepol) with string literals as its second parameter is a non-constant
string.

Indeed /usr/include/sepol/policydb/hashtab.h contains:

    typedef char *hashtab_key_t;
    /* ... */
    extern hashtab_datum_t hashtab_search(hashtab_t h, const hashtab_key_t k);

This means the second parameter is "char *const k", not "const char *k".
As a consequence:

* Casting to "const hashtab_key_t" leads to misunderstanding the code.
* "const char*" variables need to be explicitly casted to "char*" or
  "hashtab_key_t" before calling hashtab_search.
* When using "gcc -Wwrite-strings", literal strings need to be casted to
  "char*" or "hashtab_key_t" before calling hashtab_search.
* "gcc -Wcast-qual" reports an awful amount of warnings due to
  const-to-nonconst pointer casts.

Add missing casts to hashtab_key_t to help finding real bugs in
setools/libqpol with gcc flags.
2014-11-02 13:02:58 -05:00
Nicolas Iooss
b029b164c4 Fix comparisons between numbers with mismatched signedness in libqpol
Fix warnings reported by "gcc -Wsign-compare"
2014-11-02 13:02:58 -05:00
Nicolas Iooss
8e488c23f1 Use %s instead of %S to print strings in printf format
gcc reported the following warnings:

    libqpol/policy_extend.c: In function 'qpol_avrule_get_syn_avrule_iter':
    libqpol/policy_extend.c:1219:3: warning: format '%S' expects
    argument of type 'wchar_t *', but argument 4 has type 'char *'
    [-Wformat=]
       ERR(policy, "%S", strerror(error));
       ^
    libqpol/policy_extend.c: In function 'qpol_terule_get_syn_terule_iter':
    libqpol/policy_extend.c:1320:3: warning: format '%S' expects
    argument of type 'wchar_t *', but argument 4 has type 'char *'
    [-Wformat=]
       ERR(policy, "%S", strerror(error));
       ^
2014-11-02 13:02:11 -05:00
Chris PeBenito
8363f8edf7 Import libqpol from setools3.
Break setools3 dependence. Also fix SWIG wrapper to work with SWIG 2.x.
2014-10-24 21:00:24 -04:00