summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-05-06 16:36:46 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-05-06 16:36:46 +0000
commit430f6ffa6172d629e8f5a0baca1ed43c9afd54db (patch)
treecba70984afc26fc0dd1ae59f967e3baadde6edfe /cpukit
parent2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-430f6ffa6172d629e8f5a0baca1ed43c9afd54db.tar.bz2
2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/uuid/gen_uuid.c, libnetworking/lib/syslog.c, telnetd/telnetd.c: Fixed warnings.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/libmisc/uuid/gen_uuid.c5
-rw-r--r--cpukit/libnetworking/lib/syslog.c2
-rw-r--r--cpukit/telnetd/telnetd.c2
4 files changed, 11 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 4d54a1152e..e6dd6fadbb 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * libmisc/uuid/gen_uuid.c, libnetworking/lib/syslog.c,
+ telnetd/telnetd.c: Fixed warnings.
+
+2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* libcsupport/Makefile.am:
* libcsupport/src/isatty_r.c: New file.
diff --git a/cpukit/libmisc/uuid/gen_uuid.c b/cpukit/libmisc/uuid/gen_uuid.c
index dbb0726bb9..b0219059ec 100644
--- a/cpukit/libmisc/uuid/gen_uuid.c
+++ b/cpukit/libmisc/uuid/gen_uuid.c
@@ -177,7 +177,9 @@ static void get_random_bytes(void *buf, int nbytes)
int i, n = nbytes, fd = get_random_fd();
int lose_counter = 0;
unsigned char *cp = (unsigned char *) buf;
+#ifdef DO_JRAND_MIX
unsigned short tmp_seed[3];
+#endif
if (fd >= 0) {
while (n > 0) {
@@ -417,6 +419,8 @@ try_again:
return 0;
}
+/* unused */
+#if defined(USE_UUIDD) && defined(HAVE_SYS_UN_H)
static ssize_t read_all(int fd, char *buf, size_t count)
{
ssize_t ret;
@@ -436,6 +440,7 @@ static ssize_t read_all(int fd, char *buf, size_t count)
}
return c;
}
+#endif
#if defined(USE_UUIDD) && defined(HAVE_SYS_UN_H)
diff --git a/cpukit/libnetworking/lib/syslog.c b/cpukit/libnetworking/lib/syslog.c
index 6edd34a91d..3bd9c3ce70 100644
--- a/cpukit/libnetworking/lib/syslog.c
+++ b/cpukit/libnetworking/lib/syslog.c
@@ -57,7 +57,7 @@ vsyslog (int pri, const char *fmt, va_list ap)
pri &= LOG_PRIMASK|LOG_FACMASK;
}
- if (!LOG_MASK(LOG_PRI(pri)) & LogMask)
+ if (!(LOG_MASK(LOG_PRI(pri)) & LogMask))
return;
if ((pri & LOG_FACMASK) == 0)
diff --git a/cpukit/telnetd/telnetd.c b/cpukit/telnetd/telnetd.c
index ec6caabc6f..7175668325 100644
--- a/cpukit/telnetd/telnetd.c
+++ b/cpukit/telnetd/telnetd.c
@@ -302,8 +302,6 @@ rtems_task_telnetd(void *task_argument)
rtems_status_code rtems_telnetd_initialize( void)
{
- rtems_status_code sc = RTEMS_SUCCESSFUL;
-
if (telnetd_task_id != RTEMS_ID_NONE) {
fprintf(stderr, "telnetd already started\n");
return RTEMS_RESOURCE_IN_USE;