w3m

commit f4b747d05b9a80e88b350f1a8c2f2902b40bac75
parent 3004c62881657cd3db76c071f852e3ec7e10b09b
Author: ukai <ukai>
Date:   Tue, 15 Jan 2002 03:45:02 +0000

file.c (loadGeneralFile): return NULL, not NO_BUFFER

Diffstat:
M
ChangeLog
 | 
4
++++
M
file.c
 | 
16
++++++++--------

2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-15  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* file.c (loadGeneralFile): return NULL, not NO_BUFFER
+
+2002-01-15  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* [w3m-dev 02833] ssl_forbid_method in SSL Setting
 	* rc.c (params7): ssl_forbid_method moved here
 	* rc.c (params8): ssl_forbid_method removed here
diff --git a/file.c b/file.c
@@ -1052,7 +1052,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	    {
 		struct stat st;
 		if (stat(pu.real_file, &st) < 0)
-		    return NO_BUFFER;
+		    return NULL;
 		if (S_ISDIR(st.st_mode)) {
 		    if (UseExternalDirBuffer) {
 			Str cmd = Strnew_charp(DirBufferCommand);
@@ -1069,7 +1069,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 		    else {
 			b = dirBuffer(pu.real_file);
 			if (b == NULL)
-			    return NO_BUFFER;
+			    return NULL;
 			t = "text/html";
 			b->real_scheme = pu.scheme;
 			goto loaded;
@@ -1090,7 +1090,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	}
 	disp_err_message(Sprintf("Unknown URI: %s",
 				 parsedURL2Str(&pu)->ptr)->ptr, FALSE);
-	return NO_BUFFER;
+	return NULL;
     }
 
     /* openURL() succeeded */
@@ -1103,7 +1103,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	if (b)
 	    discardBuffer(b);
 	UFclose(&f);
-	return NO_BUFFER;
+	return NULL;
     }
 
     b = NULL;
@@ -1140,7 +1140,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	if (IStype(f.stream) == IST_SSL) {
 	    Str s = ssl_get_certificate(f.stream, pu.host);
 	    if (s == NULL)
-		return NO_BUFFER;
+		return NULL;
 	    else
 		t_buf->ssl_certificate = s->ptr;
 	}
@@ -1200,7 +1200,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 		    /* abort */
 		    UFclose(&f);
 		    signal(SIGINT, prevtrap);
-		    return NO_BUFFER;
+		    return NULL;
 		}
 		UFclose(&f);
 		add_auth_cookie_flag = 1;
@@ -1221,7 +1221,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 		    /* abort */
 		    UFclose(&f);
 		    signal(SIGINT, prevtrap);
-		    return NO_BUFFER;
+		    return NULL;
 		}
 		UFclose(&f);
 		status = HTST_NORMAL;
@@ -1438,7 +1438,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
     if (IStype(f.stream) == IST_SSL) {
 	Str s = ssl_get_certificate(f.stream, pu.host);
 	if (s == NULL)
-	    return NO_BUFFER;
+	    return NULL;
 	else
 	    t_buf->ssl_certificate = s->ptr;
     }