summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Popelka <jpopelka@redhat.com>2012-01-23 14:05:12 +0100
committerJiri Popelka <jpopelka@redhat.com>2012-01-27 09:49:08 +0100
commitb8cd80d929171d494d248a8c8e05175cb3338784 (patch)
tree4d3d181a3f14b484d1e18b883e742a282680f8fa
parenta1de64793a9420bddf4dff308a244c5d2cb52d1b (diff)
downloadnet-tools-b8cd80d929171d494d248a8c8e05175cb3338784.tar.gz
net-tools-b8cd80d929171d494d248a8c8e05175cb3338784.tar.bz2
net-tools-b8cd80d929171d494d248a8c8e05175cb3338784.zip
Fixed 2 SELinux related compiler warnings.
-rw-r--r--netstat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/netstat.c b/netstat.c
index 2ff4bc8..035e1bc 100644
--- a/netstat.c
+++ b/netstat.c
@@ -91,8 +91,6 @@
#if HAVE_SELINUX
#include <selinux/selinux.h>
-#else
-#define security_context_t char*
#endif
#include "net-support.h"
#include "pathnames.h"
@@ -300,7 +298,7 @@ static void prg_cache_add(unsigned long inode, char *name, const char *scon)
strcpy(pn->name, name);
{
- size_t len = (strlen(scon) - sizeof(pn->scon)) + 1;
+ int len = (strlen(scon) - sizeof(pn->scon)) + 1;
if (len > 0)
strcpy(pn->scon, &scon[len + 1]);
else
@@ -408,7 +406,9 @@ static void prg_cache_load(void)
const char *cs, *cmdlp;
DIR *dirproc = NULL, *dirfd = NULL;
struct dirent *direproc, *direfd;
+#if HAVE_SELINUX
security_context_t scon = NULL;
+#endif
if (prg_cache_loaded || !flag_prg) return;
prg_cache_loaded = 1;