<aito@ei5sun.yz.yamagata-u.ac.jp> wrote:
> The looooooooooooooooooooong waited new version 0.1.8
> is just released.
More cosmetics:
The following patch cleans up all warnings produced by "gcc -Wall"
(GCC 2.95.2 on i386-freebsd), except a missing prototype for
dir_exist() in url.c. I don't know whether this should be added to
proto.h or directly to url.c.
--- file.c.old Thu Apr 6 22:45:53 2000
+++ file.c Thu Apr 6 22:49:05 2000
@@ -102,8 +102,6 @@
};
#define HR_RULE "-"
#define HR_RULE_WIDTH 1
-
-static int graph_mode = NIL;
#endif /* not KANJI_SYMBOLS */
#ifndef STRCHR
@@ -319,7 +317,6 @@
ParsedURL *pu)
{
char *p, *q;
- char code;
char c;
Str lineBuf2 = NULL;
Str tmp;
@@ -3158,9 +3155,6 @@
int frameset_sp = -1;
Str tmp;
int hseq;
-#ifdef NEW_FORM
- int form_id;
-#endif /* NEW_FORM */
if (w3m_debug)
debug = fopen("zzzerr","a");
@@ -4772,7 +4766,6 @@
Line *l, *fl, *pl = buf->lastLine;
Line *rl = NULL;
int len, i, n = 0;
- char code;
Str lbuf;
static Str pre_lbuf = NULL;
--- ftp.c.old Thu Apr 6 22:55:26 2000
+++ ftp.c Thu Apr 6 22:56:38 2000
@@ -345,8 +345,10 @@
Str pwd;
int add_auth_cookie_flag;
char *realpath = NULL;
+#ifdef JP_CHARSET
char code;
Str pathStr;
+#endif
int sv_type;
add_auth_cookie_flag = 0;
--- indep.c.old Thu Apr 6 22:56:48 2000
+++ indep.c Thu Apr 6 22:57:09 2000
@@ -182,7 +182,7 @@
getescapechar(char **s)
{
int i,dummy;
- char *save,*p;
+ char *save;
Str tmp = Strnew();
save = *s;
--- main.c.old Thu Apr 6 23:10:54 2000
+++ main.c Thu Apr 6 23:15:05 2000
@@ -525,7 +525,7 @@
static void
keyPressEventProc(int c)
{
- w3mFuncList[GlobalKeymap[c]].func ();
+ w3mFuncList[(int)GlobalKeymap[c]].func ();
onA();
}
@@ -577,7 +577,7 @@
void
escmap(void)
{
- w3mFuncList[EscKeymap[(int)getch()]].func ();
+ w3mFuncList[(int)EscKeymap[(int)getch()]].func ();
}
void
@@ -589,7 +589,7 @@
if (IS_DIGIT(c))
escdmap(c);
else
- w3mFuncList[EscBKeymap[(int)c]].func ();
+ w3mFuncList[(int)EscBKeymap[(int)c]].func ();
}
void
@@ -604,7 +604,7 @@
c = getch();
}
if (c == '~')
- w3mFuncList[EscDKeymap[d]].func ();
+ w3mFuncList[(int)EscDKeymap[d]].func ();
}
static void
@@ -3180,11 +3180,12 @@
if (obs & ~nbs)
btn = MOUSE_BTN_UP;
- else if (bits = nbs & ~obs)
+ else if (nbs & ~obs) {
+ bits = nbs & ~obs;
btn = bits & 0x1 ? MOUSE_BTN1_DOWN :
(bits & 0x2 ? MOUSE_BTN2_DOWN :
(bits & 0x4 ? MOUSE_BTN3_DOWN : 0));
- else /* nbs == obs */
+ } else /* nbs == obs */
return 0;
process_mouse(btn, x, y);
return 0;
--- map.c.old Thu Apr 6 22:50:05 2000
+++ map.c Thu Apr 6 22:51:58 2000
@@ -72,6 +72,7 @@
}
}
+#ifdef JP_CHARSET
static char*
code_str(char code)
{
@@ -86,6 +87,7 @@
default: return "unknown";
}
}
+#endif /* JP_CHARSET */
/*
* information of current page and link
--- menu.c.old Thu Apr 6 23:08:29 2000
+++ menu.c Thu Apr 6 23:12:57 2000
@@ -915,11 +915,12 @@
if (obs & ~nbs)
btn = MOUSE_BTN_UP;
- else if (bits = nbs & ~obs)
+ else if (nbs & ~obs) {
+ bits = nbs & ~obs;
btn = bits & 0x1 ? MOUSE_BTN1_DOWN :
(bits & 0x2 ? MOUSE_BTN2_DOWN :
(bits & 0x4 ? MOUSE_BTN3_DOWN : 0));
- else /* nbs == obs */
+ } else /* nbs == obs */
return 0;
X_Mouse_Selection = process_mMouse(btn, x, y);
return X_MOUSE_SELECTED;
--- table.c.old Thu Apr 6 22:49:33 2000
+++ table.c Thu Apr 6 22:49:53 2000
@@ -940,7 +940,7 @@
short cwidth[MAXCELL], swidth[MAXCELL];
#endif /* __GNUC__ */
int twidth;
- double sxx, sxy, *Sxx, stotal;
+ double sxy, *Sxx, stotal;
twidth = 0;
stotal = 0.;
--- terms.c.old Thu Apr 6 22:52:12 2000
+++ terms.c Thu Apr 6 22:53:01 2000
@@ -529,8 +529,10 @@
return 0;
}
+#ifdef JP_CHARSET
static int wmode = C_ASCII;
static char wbuf;
+#endif
int
write1(char c)
--- url.c.old Thu Apr 6 22:53:19 2000
+++ url.c Thu Apr 6 23:01:09 2000
@@ -2,6 +2,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netdb.h>
#include <signal.h>
@@ -1040,7 +1041,6 @@
tmp = HTTPrequest(pu,current,&hr,NULL);
write(sock, tmp->ptr, tmp->length);
} else {
- no_ftp_proxy:
uf.stream.f = openFTP(pu);
uf.scheme = pu->scheme;
uf.close = (void(*)())closeFTP ;
@@ -1106,7 +1106,6 @@
pu->label = save_label;
}
} else {
- no_http_proxy:
sock = openSocket(pu->host,
schemetable[pu->scheme].cmdname,
pu->port);
@@ -1169,7 +1168,6 @@
return uf;
tmp = HTTPrequest(pu,current,&hr,NULL);
} else {
- no_gopher_proxy:
sock = openSocket(pu->host,
schemetable[pu->scheme].cmdname,
pu->port);
-- Christian "naddy" Weisgerber naddy@mips.rhein-neckar.de
This archive was generated by hypermail 2b29 : Wed Jul 19 2000 - 10:30:43 CDT