aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fm.h16
-rw-r--r--hash.h4
-rw-r--r--istream.h4
-rw-r--r--main.c82
-rw-r--r--proto.h12
5 files changed, 59 insertions, 59 deletions
diff --git a/fm.h b/fm.h
index f3b7d07..bd0acd0 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.117 2003/04/08 16:27:29 ukai Exp $ */
+/* $Id: fm.h,v 1.118 2003/07/22 17:33:16 ukai Exp $ */
/*
* w3m: WWW wo Miru utility
*
@@ -393,9 +393,9 @@ typedef struct {
#define LINK_TYPE_REV 2
typedef struct _LinkList {
char *url;
- char *title; /* Next, Contents, ... */
- char *ctype; /* Content-Type */
- char type; /* Rel, Rev */
+ char *title; /* Next, Contents, ... */
+ char *ctype; /* Content-Type */
+ char type; /* Rel, Rev */
struct _LinkList *next;
} LinkList;
@@ -846,9 +846,9 @@ global char *index_file init(NULL);
global char *CurrentDir;
global int CurrentPid;
/*
-global Buffer *Currentbuf;
-global Buffer *Firstbuf;
-*/
+ * global Buffer *Currentbuf;
+ * global Buffer *Firstbuf;
+ */
global TabBuffer *CurrentTab;
global TabBuffer *FirstTab;
global TabBuffer *LastTab;
@@ -921,7 +921,7 @@ global int useExtImageViewer init(TRUE);
global int maxLoadImage init(4);
global int image_map_list init(TRUE);
#else
-global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */
+global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */
#endif
global char *Editor init(DEF_EDITOR);
#ifdef USE_W3MMAILER
diff --git a/hash.h b/hash.h
index 5f1118f..c835902 100644
--- a/hash.h
+++ b/hash.h
@@ -1,4 +1,4 @@
-/* $Id: hash.h,v 1.4 2001/12/10 17:02:44 ukai Exp $ */
+/* $Id: hash.h,v 1.5 2003/07/22 17:33:16 ukai Exp $ */
#ifndef HASH_H
#define HASH_H
@@ -19,7 +19,7 @@ extern void putHash_##sym(Hash_##sym *t, keytype key, type value); \
extern type getHash_##sym(Hash_##sym *t, keytype key, type failval);
defhash(char *, int, si)
-defhash(char *, char *, ss)
+ defhash(char *, char *, ss)
defhash(char *, void *, sv)
defhash(int, void *, iv)
#define defhashfunc(keytype,type,sym) \
diff --git a/istream.h b/istream.h
index dc60a0f..7914ebe 100644
--- a/istream.h
+++ b/istream.h
@@ -1,4 +1,4 @@
-/* $Id: istream.h,v 1.10 2003/01/10 17:06:24 ukai Exp $ */
+/* $Id: istream.h,v 1.11 2003/07/22 17:33:16 ukai Exp $ */
#ifndef IO_STREAM_H
#define IO_STREAM_H
@@ -126,7 +126,7 @@ extern int ISfileno(InputStream stream);
extern int ISeos(InputStream stream);
#ifdef USE_SSL
extern void ssl_accept_this_site(char *hostname);
-extern Str ssl_get_certificate(SSL *ssl, char *hostname);
+extern Str ssl_get_certificate(SSL * ssl, char *hostname);
#endif
#define IST_BASIC 0
diff --git a/main.c b/main.c
index 992b0bf..435b23f 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.228 2003/07/22 17:27:19 ukai Exp $ */
+/* $Id: main.c,v 1.229 2003/07/22 17:33:16 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -3500,7 +3500,7 @@ _nextA(int visited)
x = Currentbuf->pos;
if (visited == TRUE) {
- n = hl->nmark;
+ n = hl->nmark;
}
for (i = 0; i < n; i++) {
@@ -3509,8 +3509,8 @@ _nextA(int visited)
int hseq = an->hseq + 1;
do {
if (hseq >= hl->nmark) {
- if (visited == TRUE)
- return;
+ if (visited == TRUE)
+ return;
an = pan;
goto _end;
}
@@ -3520,36 +3520,36 @@ _nextA(int visited)
an = retrieveAnchor(Currentbuf->formitem, po->line,
po->pos);
hseq++;
- if (visited == TRUE && an) {
- parseURL2(an->url, &url, baseURL(Currentbuf));
- if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
- goto _end;
- }
- }
+ if (visited == TRUE && an) {
+ parseURL2(an->url, &url, baseURL(Currentbuf));
+ if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
+ goto _end;
+ }
+ }
} while (an == NULL || an == pan);
}
else {
an = closest_next_anchor(Currentbuf->href, NULL, x, y);
- if (visited != TRUE)
- an = closest_next_anchor(Currentbuf->formitem, an, x, y);
+ if (visited != TRUE)
+ an = closest_next_anchor(Currentbuf->formitem, an, x, y);
if (an == NULL) {
- if (visited == TRUE)
- return;
+ if (visited == TRUE)
+ return;
an = pan;
break;
}
x = an->start.pos;
y = an->start.line;
- if (visited == TRUE) {
- parseURL2(an->url, &url, baseURL(Currentbuf));
- if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
- goto _end;
- }
- }
+ if (visited == TRUE) {
+ parseURL2(an->url, &url, baseURL(Currentbuf));
+ if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
+ goto _end;
+ }
+ }
}
}
if (visited == TRUE)
- return;
+ return;
_end:
if (an == NULL || an->hseq < 0)
@@ -3584,7 +3584,7 @@ _prevA(int visited)
x = Currentbuf->pos;
if (visited == TRUE) {
- n = hl->nmark;
+ n = hl->nmark;
}
for (i = 0; i < n; i++) {
@@ -3593,8 +3593,8 @@ _prevA(int visited)
int hseq = an->hseq - 1;
do {
if (hseq < 0) {
- if (visited == TRUE)
- return;
+ if (visited == TRUE)
+ return;
an = pan;
goto _end;
}
@@ -3604,36 +3604,36 @@ _prevA(int visited)
an = retrieveAnchor(Currentbuf->formitem, po->line,
po->pos);
hseq--;
- if (visited == TRUE && an) {
- parseURL2(an->url, &url, baseURL(Currentbuf));
- if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
- goto _end;
- }
- }
+ if (visited == TRUE && an) {
+ parseURL2(an->url, &url, baseURL(Currentbuf));
+ if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
+ goto _end;
+ }
+ }
} while (an == NULL || an == pan);
}
else {
an = closest_prev_anchor(Currentbuf->href, NULL, x, y);
- if (visited != TRUE)
- an = closest_prev_anchor(Currentbuf->formitem, an, x, y);
+ if (visited != TRUE)
+ an = closest_prev_anchor(Currentbuf->formitem, an, x, y);
if (an == NULL) {
- if (visited == TRUE)
- return;
+ if (visited == TRUE)
+ return;
an = pan;
break;
}
x = an->start.pos;
y = an->start.line;
- if (visited == TRUE && an) {
- parseURL2(an->url, &url, baseURL(Currentbuf));
- if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
- goto _end;
- }
+ if (visited == TRUE && an) {
+ parseURL2(an->url, &url, baseURL(Currentbuf));
+ if (getHashHist(URLHist, parsedURL2Str(&url)->ptr)) {
+ goto _end;
+ }
+ }
}
}
- }
if (visited == TRUE)
- return;
+ return;
_end:
if (an == NULL || an->hseq < 0)
diff --git a/proto.h b/proto.h
index 644b6e8..006eb43 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.93 2003/07/22 17:24:49 ukai Exp $ */
+/* $Id: proto.h,v 1.94 2003/07/22 17:33:16 ukai Exp $ */
/*
* This file was automatically generated by version 1.7 of cextract.
* Manual editing not recommended.
@@ -118,7 +118,7 @@ extern void stopI(void);
#endif
#ifdef USE_ALARM
extern void setAlarm(void);
-extern AlarmEvent *setAlarmEvent(AlarmEvent *event, int sec, short status,
+extern AlarmEvent *setAlarmEvent(AlarmEvent * event, int sec, short status,
int cmd, void *data);
#else
#define setAlarm nulcmd
@@ -212,7 +212,7 @@ extern void HTMLlineproc0(char *istr, struct html_feed_environ *h_env,
extern Buffer *loadHTMLBuffer(URLFile *f, Buffer *newBuf);
extern char *convert_size(clen_t size, int usefloat);
extern char *convert_size2(clen_t size1, clen_t size2, int usefloat);
-extern void showProgress(clen_t *linelen, clen_t *trbyte);
+extern void showProgress(clen_t * linelen, clen_t * trbyte);
extern void init_henv(struct html_feed_environ *, struct readbuffer *,
struct environment *, int, TextLineList *, int, int);
extern void completeHTMLstream(struct html_feed_environ *,
@@ -250,7 +250,7 @@ extern void readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu);
extern char *checkHeader(Buffer *buf, char *field);
extern TabBuffer *newTab(void);
extern void calcTabPos(void);
-extern TabBuffer *deleteTab(TabBuffer *tab);
+extern TabBuffer *deleteTab(TabBuffer * tab);
extern void addDownloadList(pid_t pid, char *url, char *save, char *lock,
clen_t size);
extern void stopDownload(void);
@@ -422,7 +422,7 @@ extern void set_int(void);
extern void getTCstr(void);
extern void setlinescols(void);
extern void setupscreen(void);
-extern pid_t open_pipe_rw(FILE **fr, FILE **fw);
+extern pid_t open_pipe_rw(FILE ** fr, FILE ** fw);
extern int initscr(void);
extern int write1(char c);
extern void endline(void);
@@ -612,7 +612,7 @@ extern char *url_unquote_conv(char *url, char code);
extern char *expandName(char *name);
extern Str tmpfname(int type, char *ext);
extern time_t mymktime(char *timestr);
-extern void (*mySignal(int signal_number, void (*action)(int)))(int);
+extern void (*mySignal(int signal_number, void (*action) (int))) (int);
#ifdef USE_COOKIE
extern char *FQDN(char *host);
extern Str find_cookie(ParsedURL *pu);