From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Mar 2011 02:50:36 +0000 (-0700)
Subject: * fileio.c (Ffile_selinux_context, Fset_file_selinux_context): Fix pointer
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b14aac08d08c5f17dc27e8d2cc1cc76b33e92c62;p=emacs.git

* fileio.c (Ffile_selinux_context, Fset_file_selinux_context): Fix pointer

signedness issues.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 567fe22a941..aa21fb17c85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,8 @@
 	(Fexpand_file_name): Likewise.  In particular, newdir might
 	point at constant storage, so make it a const pointer.
 	(Fmake_directory_internal, Fread_file_name): Remove unused vars.
+	(Ffile_selinux_context, Fset_file_selinux_context): Fix pointer
+	signedness issues.
 
 	* minibuf.c (choose_minibuf_frame_1): Now static.
 	(Ftry_completion, Fall_completions): Rename or remove locals
diff --git a/src/fileio.c b/src/fileio.c
index b99311445b3..b4e28702029 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2756,7 +2756,7 @@ if file does not exist, is not accessible, or SELinux is disabled */)
 #if HAVE_LIBSELINUX
   if (is_selinux_enabled ())
     {
-      conlength = lgetfilecon (SDATA (absname), &con);
+      conlength = lgetfilecon (SSDATA (absname), &con);
       if (conlength > 0)
 	{
 	  context = context_new (con);
@@ -2811,34 +2811,35 @@ is disabled. */)
   if (is_selinux_enabled ())
     {
       /* Get current file context. */
-      conlength = lgetfilecon (SDATA (encoded_absname), &con);
+      conlength = lgetfilecon (SSDATA (encoded_absname), &con);
       if (conlength > 0)
 	{
 	  parsed_con = context_new (con);
 	  /* Change the parts defined in the parameter.*/
 	  if (STRINGP (user))
 	    {
-	      if (context_user_set (parsed_con, SDATA (user)))
+	      if (context_user_set (parsed_con, SSDATA (user)))
 		error ("Doing context_user_set");
 	    }
 	  if (STRINGP (role))
 	    {
-	      if (context_role_set (parsed_con, SDATA (role)))
+	      if (context_role_set (parsed_con, SSDATA (role)))
 		error ("Doing context_role_set");
 	    }
 	  if (STRINGP (type))
 	    {
-	      if (context_type_set (parsed_con, SDATA (type)))
+	      if (context_type_set (parsed_con, SSDATA (type)))
 		error ("Doing context_type_set");
 	    }
 	  if (STRINGP (range))
 	    {
-	      if (context_range_set (parsed_con, SDATA (range)))
+	      if (context_range_set (parsed_con, SSDATA (range)))
 		error ("Doing context_range_set");
 	    }
 
 	  /* Set the modified context back to the file. */
-	  fail = lsetfilecon (SDATA (encoded_absname), context_str (parsed_con));
+	  fail = lsetfilecon (SSDATA (encoded_absname),
+			      context_str (parsed_con));
 	  if (fail)
 	    report_file_error ("Doing lsetfilecon", Fcons (absname, Qnil));