Get some of the last remaining C files into C++

They still need to be fixed up, but they now build with C++.
2025-08-23 02:09:47 -04:00
parent e4f1102e32
commit f283391b46
78 changed files with 172 additions and 144 deletions
--- a/src/IO/IO.cc
+++ b/src/IO/IO.cc
@ -18,7 +18,7 @@
 #include <unistd.h>
 #include "../msg.hh"
 #include "../chain.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "IO.hh"
 #include "iowatch.hh"
 #include "tls.hh"
--- a/src/IO/IO.hh
+++ b/src/IO/IO.hh
@ -4,7 +4,7 @@
 #include <string_view>

 #include "d_size.h"
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"
 #include "../chain.hh"

 /*
--- a/src/IO/Url.h
+++ b/src/IO/Url.h
@ -3,7 +3,7 @@

 #include "../chain.hh"
 #include "../url.hh"
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/IO/dpi.cc
+++ b/src/IO/dpi.cc
@ -36,11 +36,11 @@
 #include <netdb.h>

 #include "../msg.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "IO.hh"
 #include "Url.h"
-#include "../../dpip/dpip.h"
-#include "dlib/dlib.h"
+#include "../../dpip/dpip.hh"
+#include "dlib/dlib.hh"

 /* This one is tricky, some sources state it should include the byte
 * for the terminating NULL, and others say it shouldn't. */
--- a/src/IO/http.cc
+++ b/src/IO/http.cc
@ -32,7 +32,7 @@
 #include "tls.hh"
 #include "Url.h"
 #include "../msg.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "../dns.hh"
 #include "../web.hh"
 #include "../cookies.hh"
--- a/src/IO/mime.hh
+++ b/src/IO/mime.hh
@ -14,13 +14,13 @@

 #include <config.h>

+#include "../cache.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */


-#include "../cache.hh"
-
 typedef void* (*Viewer_t) (const char*, void*, CA_Callback_t*, void**);

 /**
--- a/src/IO/tls_openssl.cc
+++ b/src/IO/tls_openssl.cc
@ -45,9 +45,9 @@
 #include <ctype.h>            /* tolower for wget stuff */
 #include <stdio.h>
 #include <errno.h>
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"
 #include "../dialog.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "iowatch.hh"
 #include "tls.hh"
 #include "Url.h"
--- a/src/IO/tls_openssl.hh
+++ b/src/IO/tls_openssl.hh
@ -25,12 +25,12 @@
 #ifndef __TLS_OPENSSL_H__
 #define __TLS_OPENSSL_H__

+#include "../url.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "../url.hh"
-
 const char *a_Tls_openssl_version(char *buf, int n);
 void a_Tls_openssl_init(void);
 int a_Tls_openssl_certificate_is_clean(const DilloUrl *url);
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -68,8 +68,8 @@ flenser_SOURCES = \
 	url.hh \
 	bitvec.cc \
 	bitvec.hh \
-	klist.c \
-	klist.h \
+	klist.cc \
+	klist.hh \
 	chain.cc \
 	chain.hh \
 	utf8.cc \
--- a/src/actions.cc
+++ b/src/actions.cc
@ -11,7 +11,7 @@

 #include "actions.hh"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include <errno.h>

 static Dlist *link_actions = NULL;
--- a/src/actions.hh
+++ b/src/actions.hh
@ -12,12 +12,12 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H

+#include "dlib/dlib.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "dlib/dlib.h"
-
 typedef struct {
   char *label;
   char *cmd;
--- a/src/auth.cc
+++ b/src/auth.cc
@ -23,7 +23,7 @@
 #include "misc.hh"
 #include "dialog.hh"
 #include "digest.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 typedef struct {
   int ok;
--- a/src/bitvec.cc
+++ b/src/bitvec.cc
@ -13,7 +13,7 @@
 * A simple ADT for bit arrays
 */

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "bitvec.hh"

 extern "C" {
--- a/src/bookmark.cc
+++ b/src/bookmark.cc
@ -15,7 +15,7 @@
 #include "history.hh"
 #include "capi.hh"
 #include "bookmark.hh"  /* for prototypes */
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"



--- a/src/cache.hh
+++ b/src/cache.hh
@ -1,14 +1,15 @@
 #ifndef __CACHE_H__
 #define __CACHE_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-

 #include "chain.hh"
 #include "url.hh"

+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
 * Cache Op codes
 */
--- a/src/capi.cc
+++ b/src/capi.cc
@ -31,7 +31,7 @@
 #include "dpiapi.hh"
 #include "uicmd.hh"
 #include "domain.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "prefs.hh"

 /* for testing dpi chat */
--- a/src/chain.cc
+++ b/src/chain.cc
@ -15,7 +15,7 @@

 #include "msg.hh"
 #include "chain.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #define VERBOSE 0

--- a/src/cookies.cc
+++ b/src/cookies.cc
@ -43,7 +43,7 @@ void a_Cookies_init(void)
 #include "list.h"
 #include "cookies.hh"
 #include "capi.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"


 /** The maximum length of a line in the cookie file */
--- a/src/css.cc
+++ b/src/css.cc
@ -10,7 +10,7 @@
 */

 #include <stdio.h>
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "html_common.hh"
 #include "css.hh"
--- a/src/decode.hh
+++ b/src/decode.hh
@ -1,7 +1,7 @@
 #ifndef __DECODE_H__
 #define __DECODE_H__

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/dgif.hh
+++ b/src/dgif.hh
@ -1,13 +1,13 @@
 #ifndef __GIF_H__
 #define __GIF_H__

+#include "url.hh"
+#include "image.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-
 struct DilloGif;

 DilloGif *a_Gif_new(DilloImage *Image, DilloUrl *url, int version);
--- a/src/dialog.cc
+++ b/src/dialog.cc
@ -37,7 +37,7 @@
 #include "dialog.hh"
 #include "misc.hh"
 #include "prefs.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 /*
 * Local Data
--- a/src/digest.cc
+++ b/src/digest.cc
@ -13,7 +13,7 @@
 #include "digest.hh"
 #include "md5.h"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #include <string_view>

--- a/src/digest.hh
+++ b/src/digest.hh
@ -2,7 +2,7 @@
 #define __DIGEST_H__

 #include "auth.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/djpeg.hh
+++ b/src/djpeg.hh
@ -1,13 +1,14 @@
 #ifndef __JPEG_H__
 #define __JPEG_H__

+#include "url.hh"
+#include "image.hh"
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-

 void *a_Jpeg_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Jpeg_callback(int Op, void *data);
--- a/src/domain.cc
+++ b/src/domain.cc
@ -12,7 +12,7 @@
 #include <vector>
 #include <string>

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "list.h"
 #include "domain.hh"
--- a/src/dpiapi.cc
+++ b/src/dpiapi.cc
@ -18,7 +18,7 @@
 #include "capi.hh"
 #include "dpiapi.hh"  /* for prototypes */
 #include "dialog.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"


 //----------------------------------------------------------------------------
--- a/src/dpng.hh
+++ b/src/dpng.hh
@ -1,16 +1,16 @@
 #ifndef __PNG_H__
 #define __PNG_H__

+#include "url.hh"
+#include "image.hh"
+#include "cache.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #else
 #error PNG header is now C++ only
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-#include "cache.hh"
-
 struct DilloPng;

 DilloPng *a_Png_new(DilloImage *Image, DilloUrl *url, int version);
--- a/src/dsvg.hh
+++ b/src/dsvg.hh
@ -1,14 +1,14 @@
 #ifndef __SVG_H__
 #define __SVG_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include "url.hh"
 #include "image.hh"
 #include "cache.hh"

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

 void *a_Svg_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Svg_callback(int Op, CacheClient_t *Client);
--- a/src/dwebp.hh
+++ b/src/dwebp.hh
@ -1,14 +1,15 @@
 #ifndef __WEBP_H__
 #define __WEBP_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */

 #include "url.hh"
 #include "image.hh"


+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 void *a_Webp_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Webp_callback(int Op, void *data);
 const char *a_Webp_version(char *buf, int n);
--- a/src/form.cc
+++ b/src/form.cc
@ -20,7 +20,7 @@
 #include "dw/core.hh"
 #include "dw/textblock.hh"

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "misc.hh"
 #include "msg.hh"
 #include "prefs.hh"
--- a/src/hsts.cc
+++ b/src/hsts.cc
@ -31,7 +31,7 @@

 #include "hsts.hh"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "IO/tls.hh"

 #include <string>
--- a/src/keys.cc
+++ b/src/keys.cc
@ -16,7 +16,7 @@
 #include <string.h>
 #include <ctype.h>

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "keys.hh"
 #include "utf8.hh"
 #include "msg.hh"
--- a/src/klist.cc
+++ b/src/klist.cc
@ -18,7 +18,7 @@
 * remains with the caller.
 */

-#include "klist.h"
+#include "klist.hh"


 /**
--- a/src/klist.hh
+++ b/src/klist.hh
@ -1,7 +1,7 @@
 #ifndef __KLIST_H__
 #define __KLIST_H__

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"


 #ifdef __cplusplus
--- a/src/paths.cc
+++ b/src/paths.cc
@ -14,7 +14,7 @@
 #include <sys/stat.h>

 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "paths.hh"

 /*
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@ -10,7 +10,7 @@
 * (at your option) any later version.
 */

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "prefs.hh"
 #include "misc.hh"
--- a/src/tipwin.cc
+++ b/src/tipwin.cc
@ -27,7 +27,7 @@

 #include "prefs.hh"
 #include "tipwin.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 /*
 * Forward declarations
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@ -46,7 +46,7 @@
 #include "msg.hh"
 #include "prefs.hh"
 #include "misc.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 #include "dw/fltkviewport.hh"

--- a/src/url.hh
+++ b/src/url.hh
@ -13,7 +13,7 @@
 #define __URL_H__

 #include "d_size.h"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 extern "C++"
 {
--- a/src/utf8.cc
+++ b/src/utf8.cc
@ -11,7 +11,7 @@

 #include <FL/fl_utf8.h>

-#include "../dlib/dlib.h"    /* TRUE/FALSE */
+#include "../dlib/dlib.hh"    /* TRUE/FALSE */
 #include "utf8.hh"

 // C++ functions with C linkage ----------------------------------------------