aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjames <>2012-06-22 10:22:25 +0000
committerjames <>2012-06-22 10:22:25 +0000
commitc945112e89222e697c3733c69eab685f606a5be5 (patch)
tree20d0d125ed4d76259f87740d5cd9344bcade24d5 /apps
parent9a219228a74b32f3b3202609a155d8f22ba47da8 (diff)
downloadsympathy-c945112e89222e697c3733c69eab685f606a5be5.tar.gz
sympathy-c945112e89222e697c3733c69eab685f606a5be5.tar.bz2
sympathy-c945112e89222e697c3733c69eab685f606a5be5.zip
*** empty log message ***
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile.am5
-rw-r--r--apps/clients.c16
-rw-r--r--apps/expand.c8
-rw-r--r--apps/mainloop.c12
-rw-r--r--apps/sympathy.c6
-rw-r--r--apps/usage.c9
6 files changed, 47 insertions, 9 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am
index c308bee..ef1037d 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -7,6 +7,9 @@
# $Id$
#
# $Log$
+# Revision 1.13 2012/06/22 10:22:24 james
+# *** empty log message ***
+#
# Revision 1.12 2008/03/07 13:56:39 james
# *** empty log message ***
#
@@ -62,6 +65,6 @@ tidy: ${SRCS} ${HDRS}
indent -i2 -ts0 ${SRCS} ${HDRS}
/bin/rm -f *~
-AM_CFLAGS=-g -Werror
+AM_CFLAGS=-g -Wall
diff --git a/apps/clients.c b/apps/clients.c
index 0a38095..3fb294d 100644
--- a/apps/clients.c
+++ b/apps/clients.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.26 2012/06/22 10:22:24 james
+ * *** empty log message ***
+ *
* Revision 1.25 2008/05/09 12:35:57 james
* *** empty log message ***
*
@@ -95,6 +98,11 @@ static char rcsid[] = "$Id$";
#include <malloc.h>
#include "clients.h"
+static inline char *
+stop_wno_unused_on_rcsid (void)
+{
+ return rcsid;
+}
void
client_initialize (Client * c, Context * ctx)
@@ -199,7 +207,7 @@ clients_new_client (Clients * cs, Socket * s, Context * ctx)
void
clients_reap (Clients * cs, Context * ctx)
{
- Client **p, *c;
+ Client **p;
for (p = &cs->head; *p;)
@@ -302,11 +310,11 @@ send_status (Clients * cs, char *msg)
Client *c;
if (!msg)
- return;
+ return -1;
len = strlen (msg) + 1;
if (!len)
- return;
+ return -1;
if (len > IPC_MAX_BUF)
len = IPC_MAX_BUF;
@@ -335,7 +343,7 @@ send_output (Clients * cs, void *buf, int len)
Client *c;
if (!len)
- return;
+ return -1;
if (len > IPC_MAX_BUF)
len = IPC_MAX_BUF;
diff --git a/apps/expand.c b/apps/expand.c
index ad73e70..4ac563c 100644
--- a/apps/expand.c
+++ b/apps/expand.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.7 2012/06/22 10:22:24 james
+ * *** empty log message ***
+ *
* Revision 1.6 2008/03/11 17:56:04 james
* *** empty log message ***
*
@@ -33,6 +36,11 @@ static char rcsid[] = "$Id$";
#include <sympathy.h>
#include <string.h>
+static inline char *
+stop_wno_unused_on_rcsid (void)
+{
+ return rcsid;
+}
static int
xdigit_to_i (char c)
diff --git a/apps/mainloop.c b/apps/mainloop.c
index 5237bfe..9c434bb 100644
--- a/apps/mainloop.c
+++ b/apps/mainloop.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.34 2012/06/22 10:22:24 james
+ * *** empty log message ***
+ *
* Revision 1.33 2008/05/09 12:35:57 james
* *** empty log message ***
*
@@ -154,6 +157,11 @@ static char rcsid[] =
#include "clients.h"
+static inline char *
+stop_wno_unused_on_rcsid (void)
+{
+ return rcsid;
+}
typedef struct
{
@@ -436,7 +444,7 @@ msg_from_server (ANSI * a, IPC_Msg * m, Context * c)
}
break;
case IPC_MSG_TYPE_TERM:
- err += tty_parse (c, m->term.term, m->term.len);
+ err += tty_parse (c, (uint8_t *) m->term.term, m->term.len);
break;
case IPC_MSG_TYPE_STATUS:
cmd_new_status (c->d, c, m->status.status);
@@ -564,7 +572,7 @@ mainloop (Context * c, ANSI * ansi, Socket * server_socket,
{
if (clients)
send_output (clients, buf, red);
- if (tty_parse (c, buf, red))
+ if (tty_parse (c, (uint8_t *) buf, red))
break;
}
}
diff --git a/apps/sympathy.c b/apps/sympathy.c
index 92ee3e1..0b8083a 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.53 2012/06/22 10:22:24 james
+ * *** empty log message ***
+ *
* Revision 1.52 2010/07/27 14:49:34 james
* add support for byte logging
*
@@ -290,7 +293,6 @@ teedious_snprintf (char *fmt, va_list ap)
char *
gloo_paths (char *dir, char *leaf)
{
- int i;
char *ret, *ptr;
if (!dir)
dir = "";
@@ -421,7 +423,7 @@ list_sockets_in_dir (char *sockdir)
int hostname_len = strlen (hostname);
if (!dir)
- return;
+ return 0;
rewinddir (dir);
diff --git a/apps/usage.c b/apps/usage.c
index f29d9cd..c466e31 100644
--- a/apps/usage.c
+++ b/apps/usage.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.29 2012/06/22 10:22:24 james
+ * *** empty log message ***
+ *
* Revision 1.28 2011/02/28 18:11:10 james
* *** empty log message ***
*
@@ -100,6 +103,12 @@ static char rcsid[] =
#include <stdio.h>
#include <stdlib.h>
+static inline char *
+stop_wno_unused_on_rcsid (void)
+{
+ return rcsid;
+}
+
void
usage (void)
{