Update HTTP code to use 'modern' constant names.

michaelrsweet · michaelrsweet · commit 8d1c0673002c · 2024-11-21T13:46:26.000-05:00
diff --git a/htmldoc/file.c b/htmldoc/file.c
@@ -8,10 +8,6 @@
  * the file "COPYING".
  */
 
-/*
- * Include necessary headers.
- */
-
 #include "file.h"
 #include <cups/http.h>
 #include "progress.h"
@@ -525,10 +521,10 @@ file_find_check(const char *filename)	/* I - File or URL */
 
       if (!httpGet(http, connpath))
       {
-	while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+	while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);
       }
       else
-	status = HTTP_ERROR;
+	status = HTTP_STATUS_ERROR;
 
       if (status >= HTTP_STATUS_MULTIPLE_CHOICES && status < HTTP_STATUS_BAD_REQUEST)
       {
@@ -549,7 +545,7 @@ file_find_check(const char *filename)	/* I - File or URL */
       }
     }
 
-    if (status != HTTP_OK)
+    if (status != HTTP_STATUS_OK)
     {
       progress_hide();
       progress_error((HDerror)status, "%s (%s)", httpStatus(status), filename);

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,6 @@`
`8`	`8`	`* the file "COPYING".`
`9`	`9`	`*/`
`10`	`10`
`11`		`-/*`
`12`		`- * Include necessary headers.`
`13`		`- */`
`14`		`-`
`15`	`11`	`#include "file.h"`
`16`	`12`	`#include <cups/http.h>`
`17`	`13`	`#include "progress.h"`
`@@ -525,10 +521,10 @@ file_find_check(const char filename) / I - File or URL */`
`525`	`521`
`526`	`522`	`if (!httpGet(http, connpath))`
`527`	`523`	`{`
`528`		`- while ((status = httpUpdate(http)) == HTTP_CONTINUE);`
	`524`	`+ while ((status = httpUpdate(http)) == HTTP_STATUS_CONTINUE);`
`529`	`525`	`}`
`530`	`526`	`else`
`531`		`- status = HTTP_ERROR;`
	`527`	`+ status = HTTP_STATUS_ERROR;`
`532`	`528`
`533`	`529`	`if (status >= HTTP_STATUS_MULTIPLE_CHOICES && status < HTTP_STATUS_BAD_REQUEST)`
`534`	`530`	`{`
`@@ -549,7 +545,7 @@ file_find_check(const char filename) / I - File or URL */`
`549`	`545`	`}`
`550`	`546`	`}`
`551`	`547`
`552`		`- if (status != HTTP_OK)`
	`548`	`+ if (status != HTTP_STATUS_OK)`
`553`	`549`	`{`
`554`	`550`	`progress_hide();`
`555`	`551`	`progress_error((HDerror)status, "%s (%s)", httpStatus(status), filename);`