-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi!
Attached are 5 patches which fix almost all compilation warnings.
One warnings remain:
tlsComm.c:582:10: warning: cast to pointer from integer of different size
[-Wint-to-pointer-cast]
That's true because on some 64-bit architectures
sizeof (void *) != sizeof (int).
There are also a lot of deprecated functions from gnutls. Since I have no
experience with gnutls, for the moment, I cannot do anything about it.
Maybe someone is willing to help.
Sincerely,
Gabriel
- --
// Gabriel VLASIU
//
// OpenGPG-KeyID : 44952F15
// OpenGPG-Fingerprint: 4AC5 7C26 2FE9 02DA 4906 24B2 D32B 7ED7 4495 2F15
// OpenGPG-URL : http://www.vlasiu.net/public.key
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQIcBAEBCgAGBQJRW/3fAAoJENMrftdElS8V9IoP/AhOcwQaDQXuZ3dCU/2n1t/f
6BBJBbkW8l1XiRilbv0jmxcp2LsKqEFd1Ywda/MERzCb98PH4tphOCbRXuskhG7L
nPC1Wxz9y1TKJyHloW8dfZvrRuYpe1Qm0mg/o4b6HqFK4Zx3XZumgcAz06GsFWLq
63ms76mWkhepTJQwnjgc/orxlKDAzsuZqNFM9fkcbm7jZkM3K+xdZkFC9lBwhIeI
PqhbCIQYVO6nqH/z/CYHcCZfIS79gfBBHWKFz4NiUuUnpIdDJRsFC2KcOK02e3Po
45dEAzawwtONZbRfhz66Ph9btS4rKmQMV54+yWcon/VsTS5wZY/yJ+r9h2Bwvg74
yeZqqcU0ZHbyRyih8T0A3h7QMupAKVN26ySRUJwrk+c5vPeVIFzh/XXrxYWxxud6
ycLej0LB9gR3nI1+QmvbWRaQYvfypnjsnNuo99miaKvgg24+ELw51kiYFQVBk6O4
eyGz9uyWXAsz/gPKJ0OcDMRcwNojcYIPuJAOzPnQ3HpHW2fCM4Vrt8mIvN7BIQjI
T9i8BpGnVtzMdqXp3dXxSpZ4JW2aAnwb1CrAG0EuWEv6/81aMrjwAYmIJw1ek2Re
vHedQQTmLhTP06ugrFkFA5jSA349t92UURivaY0n8QJfkB9DwAt6M+G+uZwR8Ibh
5SI/3M2Wb1szhZdGRLtM
=1uZ2
-----END PGP SIGNATURE-----
--- wmbiff/wmbiff/wmbiff.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/wmbiff.c 2013-04-03 11:41:47.492718774 +0300
@@ -1107,7 +1107,6 @@
static void do_biff(int argc, const char **argv)
{
unsigned int i;
- time_t curtime;
int Sleep_Interval;
const char **skin_xpm = NULL;
const char **bkg_xpm = NULL;
@@ -1148,7 +1147,6 @@
}
/* First time setup of button regions and labels */
- curtime = time(0);
for (i = 0; i < num_mailboxes; i++) {
/* make it easy to recover the mbox index from a mouse click */
AddMouseRegion(i, x_origin, mbox_y(i), 58, mbox_y(i + 1) - 1);
--- wmbiff/wmbiff/wmbiff.c.OLD 2013-04-03 11:42:45.266886704 +0300
+++ wmbiff/wmbiff/wmbiff.c 2013-04-03 11:43:32.033213147 +0300
@@ -23,7 +23,7 @@
#include <X11/Xlib.h>
#include <X11/xpm.h>
#include <X11/cursorfont.h>
-#include <X11/keysym.h>
+#include <X11/XKBlib.h>
#include <errno.h>
#include <string.h>
@@ -1084,7 +1084,7 @@
break;
case KeyPress:{
XKeyPressedEvent *xkpe = (XKeyPressedEvent *) &
Event;
- KeySym ks = XKeycodeToKeysym(display,
xkpe->keycode, 0);
+ KeySym ks = XkbKeycodeToKeysym(display,
xkpe->keycode, 0, 0);
if (ks > XK_0 && ks < XK_0 + min(9U,
num_mailboxes)) {
const char *click_action = mbox[ks -
XK_1].action;
if (click_action != NULL
--- wmbiff/wmbiff/Pop3Client.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/Pop3Client.c 2013-04-03 11:59:57.349018019 +0300
@@ -408,7 +408,7 @@
char buf[BUF_SIZE];
tlscomm_printf(scs, "USER %s\r\n", PCU.userName);
- if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == 0) {
POP_DM(pc, DEBUG_ERROR,
"Error reading from server authenticating
'%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
@@ -426,7 +426,7 @@
tlscomm_printf(scs, "PASS %s\r\n", PCU.password);
- if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == 0) {
POP_DM(pc, DEBUG_ERROR,
"Error reading from server (2) authenticating
'%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
@@ -437,7 +437,7 @@
PCU.password[0] = '\0';
ask_user_for_password(pc, 1); /* 1=overwrite the cache */
tlscomm_printf(scs, "PASS %s\r\n", PCU.password);
- if (tlscomm_gets(buf, BUF_SIZE, scs) == NULL) {
+ if (tlscomm_gets(buf, BUF_SIZE, scs) == 0) {
POP_DM(pc, DEBUG_ERROR,
"Error reading from server (2) authenticating '%s@%s:%d'\n",
PCU.userName, PCU.serverName, PCU.serverPort);
--- wmbiff/wmbiff/test_tlscomm.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/test_tlscomm.c 2013-04-03 12:04:28.167115209 +0300
@@ -4,6 +4,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
+#include <tlsComm.h>
int debug_default = 2;
int SkipCertificateCheck = 0;
--- wmbiff/wmbiff/test_wmbiff.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/test_wmbiff.c 2013-04-03 12:07:05.405848997 +0300
@@ -366,7 +366,7 @@
{
struct sockaddr_in addr;
int s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- int addrlen = sizeof(struct sockaddr_in);
+ socklen_t addrlen = sizeof(struct sockaddr_in);
if (s < 0) {
perror("socket");
return 1;
--- wmbiff/wmbiff/gnutls-common.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/gnutls-common.c 2013-04-03 12:10:05.788252922 +0300
@@ -39,7 +39,7 @@
{
gnutls_x509_crt crt;
const gnutls_datum *cert_list;
- int cert_list_size = 0, ret;
+ unsigned int cert_list_size = 0, ret;
char digest[20];
char serial[40];
char dn[256];
--- wmbiff/wmbiff/tlsComm.c.OLD 2013-04-01 15:26:07.000000000 +0300
+++ wmbiff/wmbiff/tlsComm.c 2013-04-03 12:50:57.201128287 +0300
@@ -124,7 +124,7 @@
ProcessPendingEvents();
gettimeofday(&time_now, NULL);
- tv.tv_sec = max(time_out.tv_sec - time_now.tv_sec + 1, 0); /*
sloppy, but bfd */
+ tv.tv_sec = max(time_out.tv_sec - time_now.tv_sec + 1, (time_t)
0); /* sloppy, but bfd */
tv.tv_usec = 0;
/* select will return if we have X stuff or we have comm stuff on
sd */
FD_ZERO(&readfds);
@@ -295,6 +295,7 @@
va_list args;
char buf[1024];
int bytes;
+ ssize_t unused __attribute__((unused));
if (scs == NULL) {
DMA(DEBUG_ERROR, "null connection to tlscomm_printf\n");
@@ -316,7 +317,8 @@
}
} else
#endif
- (void) write(scs->sd, buf, bytes);
+ /* Why???? */
+ unused = write(scs->sd, buf, bytes);
} else {
printf
("warning: tlscomm_printf called with an invalid socket
descriptor\n");
@@ -382,8 +384,8 @@
return 0;
}
- ptr = (unsigned char *) strstr(b64_data.data, CERT_SEP) + 1;
- ptr = (unsigned char *) strstr(ptr, CERT_SEP);
+ ptr = (unsigned char *) strstr((char *) b64_data.data,
CERT_SEP) + 1;
+ ptr = (unsigned char *) strstr((char *) ptr, CERT_SEP);
b64_data.size = b64_data.size - (ptr - b64_data.data);
b64_data.data = ptr;
@@ -412,7 +414,7 @@
{
int certstat;
const gnutls_datum *cert_list;
- int cert_list_size = 0;
+ unsigned int cert_list_size = 0;
gnutls_x509_crt cert;
if (gnutls_auth_get_type(scs->tls_state) != GNUTLS_CRD_CERTIFICATE) {
