From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Wed, 27 Nov 2013 12:07:06 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v1.1.0~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16a15e4489d3f745d0016cfefd84c75864879d48;p=platform%2Fupstream%2Fsmack.git

Merge branch 'v1.0.x'
---

16a15e4489d3f745d0016cfefd84c75864879d48
diff --cc libsmack/libsmack.c
index db78247,2799bec..bb8c746
--- a/libsmack/libsmack.c
+++ b/libsmack/libsmack.c
@@@ -83,8 -87,10 +87,9 @@@ struct smack_cipso 
  };
  
  static int accesses_apply(struct smack_accesses *handle, int clear);
- static inline void parse_access_type(const char *in, char out[ACC_LEN + 1]);
 -static ssize_t smack_label_length(const char *label) __attribute__((unused));
  static inline ssize_t get_label(char *dest, const char *src);
+ static inline int str_to_access_code(const char *str);
+ static inline void access_code_to_str(unsigned code, char *str);
  
  int smack_accesses_new(struct smack_accesses **accesses)
  {