adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
They still need to be fixed up, but they now build with C++.
This commit is contained in:
ADAM David Alan Martin
2025-08-23 02:09:47 -04:00
parent e4f1102e32
commit f283391b46
78 changed files with 172 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dlib/Makefile.am
View File

@ -4,5 +4,5 @@ AM_CPPFLAGS = \
noinst_LIBRARIES = libDlib.a noinst_LIBRARIES = libDlib.a
libDlib_a_SOURCES = \ libDlib_a_SOURCES = \
dlib.h \ dlib.hh \
dlib.cc dlib.cc

23
dlib/dlib.cc
View File

@ -27,7 +27,7 @@
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>
#include "dlib.h" #include "dlib.hh"
static bool dLib_show_msg = TRUE; static bool dLib_show_msg = TRUE;
@ -962,6 +962,27 @@ char *dGetline (FILE *stream)
return line; return line;
} }
std::optional< std::string >
dGetline_string (FILE *stream)
{
int ch;
Dstr *dstr;
if( stream == nullptr ) return std::nullopt;
dstr = dStr_sized_new(64);
while ((ch = fgetc(stream)) != EOF) {
dStr_append_c(dstr, ch);
if (ch == '\n')
break;
}
std::optional< std::string > line;
if(dstr->len) line= dstr->str;
dStr_free(dstr, 1);
return line;
}
/** /**
* Close a FD handling EINTR. * Close a FD handling EINTR.
*/ */

4
dlib/dlib.h → dlib/dlib.hh
View File

@ -6,7 +6,8 @@
#include <stdarg.h> /* for va_list */ #include <stdarg.h> /* for va_list */
#include <string.h> /* for strerror */ #include <string.h> /* for strerror */
#include <stdbool.h> #include <string>
#include <optional>
#include "d_size.h" #include "d_size.h"
@ -184,6 +185,7 @@ void dLib_show_messages(bool show);
*/ */
char *dGetcwd(void); char *dGetcwd(void);
char *dGethomedir(void); char *dGethomedir(void);
std::optional< std::string > dGetline_string(FILE *stream);
char *dGetline(FILE *stream); char *dGetline(FILE *stream);
int dClose(int fd); int dClose(int fd);
int dUsleep(unsigned long us); int dUsleep(unsigned long us);

2
dpi/bookmarks.cc
View File

@ -35,7 +35,7 @@
#include <netdb.h> #include <netdb.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"

2
dpi/cookies.cc
View File

@ -49,7 +49,7 @@ int main(void)
#include <netdb.h> #include <netdb.h>
#include <signal.h> #include <signal.h>
#include "dpiutil.hh" #include "dpiutil.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
/* /*

2
dpi/datauri.cc
View File

@ -18,7 +18,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"
#include "../src/misc.hh" #include "../src/misc.hh"

2
dpi/downloads.cc
View File

@ -49,7 +49,7 @@
#include "config.h" #include "config.h"
#include "dpiutil.hh" #include "dpiutil.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
/* /*
* Debugging macros * Debugging macros

2
dpi/dpiutil.hh
View File

@ -20,7 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include "d_size.h" #include "d_size.h"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus

2
dpi/file.cc
View File

@ -34,7 +34,7 @@
#include <signal.h> #include <signal.h>
#include <netinet/in.h> #include <netinet/in.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"
#include "d_size.h" #include "d_size.h"

2
dpi/ftp.cc
View File

@ -41,7 +41,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <ctype.h> #include <ctype.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"
#include "d_size.h" #include "d_size.h"

2
dpi/hello.cc
View File

@ -18,7 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"
/* /*

2
dpi/vsource.cc
View File

@ -19,7 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "dpiutil.hh" #include "dpiutil.hh"
/* /*

18
dpid/Makefile.am
View File

@ -14,17 +14,17 @@ dpidc_LDADD = \
EXTRA_DIST = dpidrc.in EXTRA_DIST = dpidrc.in
dpid_SOURCES = \ dpid_SOURCES = \
dpi.h \ dpi.hh \
dpi_socket_dir.h \ dpi_socket_dir.hh \
dpid.h \ dpid.hh \
dpid_common.h \ dpid_common.hh \
misc_new.h \ misc_new.hh \
dpi.cc \ dpi.cc \
dpi_socket_dir.c \ dpi_socket_dir.cc \
dpid.cc \ dpid.cc \
dpid_common.c \ dpid_common.cc \
main.c \ main.cc \
misc_new.c misc_new.cc
dpidc_SOURCES = dpidc.cc dpidc_SOURCES = dpidc.cc

6
dpid/dpi.cc
View File

@ -23,9 +23,9 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> /* for exit */ #include <stdlib.h> /* for exit */
#include "dpid_common.h" #include "dpid_common.hh"
#include "dpi.h" #include "dpi.hh"
#include "misc_new.h" #include "misc_new.hh"
/*! \Return /*! \Return
* Returns path to the dpi_socket_dir file * Returns path to the dpi_socket_dir file

0
dpid/dpi.h → dpid/dpi.hh
View File

21
dpid/dpi_socket_dir.c → dpid/dpi_socket_dir.cc
View File

@ -21,10 +21,10 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include "dpid_common.h" #include "dpid_common.hh"
#include "dpi.h" #include "dpi.hh"
#include "misc_new.h" #include "misc_new.hh"
#include "dpi_socket_dir.h" /* for function prototypes */ #include "dpi_socket_dir.hh" /* for function prototypes */
/*! Save socket directory name in ~/.dillo/dpi_socket_dir /*! Save socket directory name in ~/.dillo/dpi_socket_dir
* \Return * \Return
@ -76,17 +76,18 @@ int tst_dir(char *dir)
*/ */
char *mk_sockdir(void) char *mk_sockdir(void)
{ {
char *template, *logname; char *template_;
const char *logname;
logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser"; logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser";
template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL); template_ = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
if (a_Misc_mkdtemp(template) == NULL) { if (a_Misc_mkdtemp(template_) == NULL) {
ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0); ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
MSG_ERR(" - %s\n", template); MSG_ERR(" - %s\n", template_);
dFree(template); dFree(template_);
return (NULL); return (NULL);
} }
return template; return template_;
} }
/*! Create socket directory if it does not exist and save its name in /*! Create socket directory if it does not exist and save its name in

0
dpid/dpi_socket_dir.h → dpid/dpi_socket_dir.hh
View File

12
dpid/dpid.cc
View File

@ -31,13 +31,13 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <unistd.h> #include <unistd.h>
#include "dpid_common.h" #include "dpid_common.hh"
#include "dpid.h" #include "dpid.hh"
#include "dpi.h" #include "dpi.hh"
#include "dpi_socket_dir.h" #include "dpi_socket_dir.hh"
#include "misc_new.h" #include "misc_new.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
using namespace std::literals::string_literals; using namespace std::literals::string_literals;

0
dpid/dpid.h → dpid/dpid.hh
View File

2
dpid/dpid_common.c → dpid/dpid_common.cc
View File

@ -12,7 +12,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include "dpid_common.h" #include "dpid_common.hh"
/* /*
* Send a verbose error message. * Send a verbose error message.

11
dpid/dpid_common.h → dpid/dpid_common.hh
View File

@ -9,16 +9,17 @@
* the next patch * the next patch
*/ */
#ifdef __cplusplus
extern "C"
{
#endif
#include <dirent.h> #include <dirent.h>
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#include <sys/types.h> /* ssize_t */ #include <sys/types.h> /* ssize_t */
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#ifdef __cplusplus
extern "C"
{
#endif
/* /*
* Debugging macros * Debugging macros

4
dpid/dpidc.cc
View File

@ -20,8 +20,8 @@
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#define MSG_ERR(...) printf("** ERROR **: " __VA_ARGS__); #define MSG_ERR(...) printf("** ERROR **: " __VA_ARGS__);

14
dpid/main.c → dpid/main.cc
View File

@ -24,14 +24,14 @@
#include <assert.h> /* for assert */ #include <assert.h> /* for assert */
#include <sys/stat.h> /* for umask */ #include <sys/stat.h> /* for umask */
#include "dpid_common.h" #include "dpid_common.hh"
#include "dpid.h" #include "dpid.hh"
#include "dpi.h" #include "dpi.hh"
#include "dpi_socket_dir.h" #include "dpi_socket_dir.hh"
#include "misc_new.h" #include "misc_new.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
sigset_t mask_sigchld; sigset_t mask_sigchld;

24
dpid/misc_new.c → dpid/misc_new.cc
View File

@ -15,9 +15,9 @@
#include <sys/stat.h> /* stat */ #include <sys/stat.h> /* stat */
#include <stdlib.h> /* rand, srand */ #include <stdlib.h> /* rand, srand */
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "dpid_common.h" #include "dpid_common.hh"
#include "misc_new.h" /* for function prototypes */ #include "misc_new.hh" /* for function prototypes */
/*! Reads a dpi tag from a socket /*! Reads a dpi tag from a socket
* \li Continues after a signal interrupt * \li Continues after a signal interrupt
@ -128,30 +128,30 @@ int a_Misc_nohang_rdtag(int socket, int timeout, Dstr **tag)
* Alternative to mkdtemp(). * Alternative to mkdtemp().
* Not as strong as mkdtemp, but enough for creating a directory. * Not as strong as mkdtemp, but enough for creating a directory.
*/ */
char *a_Misc_mkdtemp(char *template) char *a_Misc_mkdtemp(char *template_)
{ {
for (;;) { for (;;) {
if (a_Misc_mkfname(template) && mkdir(template, 0700) == 0) if (a_Misc_mkfname(template_) && mkdir(template_, 0700) == 0)
break; break;
if (errno == EEXIST) if (errno == EEXIST)
continue; continue;
return 0; return 0;
} }
return template; return template_;
} }
/** /**
* Return a new, nonexistent file name from a template. * Return a new, nonexistent file name from a template.
* (adapted from dietlibc; alternative to mkdtemp()) * (adapted from dietlibc; alternative to mkdtemp())
*/ */
char *a_Misc_mkfname(char *template) char *a_Misc_mkfname(char *template_)
{ {
char *tmp = template + strlen(template) - 6; char *tmp = template_ + strlen(template_) - 6;
int i; int i;
uint_t random; uint_t random;
struct stat stat_buf; struct stat stat_buf;
if (tmp < template) if (tmp < template_)
goto error; goto error;
for (i = 0; i < 6; ++i) for (i = 0; i < 6; ++i)
if (tmp[i] != 'X') { if (tmp[i] != 'X') {
@ -168,10 +168,10 @@ char *a_Misc_mkfname(char *template)
tmp[i] = hexdigit > 9 ? hexdigit + 'a' - 10 : hexdigit + '0'; tmp[i] = hexdigit > 9 ? hexdigit + 'a' - 10 : hexdigit + '0';
} }
if (stat(template, &stat_buf) == -1 && errno == ENOENT) if (stat(template_, &stat_buf) == -1 && errno == ENOENT)
return template; return template_;
MSG_ERR("a_Misc_mkfname: another round for %s \n", template); MSG_ERR("a_Misc_mkfname: another round for %s \n", template_);
} }
} }

0
dpid/misc_new.h → dpid/misc_new.hh
View File

4
dpip/Makefile.am
View File

@ -4,5 +4,5 @@ AM_CPPFLAGS = \
noinst_LIBRARIES = libDpip.a noinst_LIBRARIES = libDpip.a
libDpip_a_SOURCES = \ libDpip_a_SOURCES = \
dpip.h \ dpip.hh \
dpip.c dpip.cc

2
dpip/dpip.c → dpip/dpip.cc
View File

@ -19,7 +19,7 @@
#include <unistd.h> /* for close */ #include <unistd.h> /* for close */
#include <fcntl.h> /* for fcntl */ #include <fcntl.h> /* for fcntl */
#include "dpip.h" #include "dpip.hh"
#include "d_size.h" #include "d_size.h"
#define RBUF_SZ 16*1024 #define RBUF_SZ 16*1024

4
dpip/dpip.h → dpip/dpip.hh
View File

@ -5,12 +5,12 @@
#ifndef __DPIP_H__ #ifndef __DPIP_H__
#define __DPIP_H__ #define __DPIP_H__
#include "../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "../dlib/dlib.h"
/* /*
* Communication mode flags * Communication mode flags
*/ */

2
dw/findtext.cc
View File

@ -20,7 +20,7 @@
#include "core.hh" #include "core.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/debug.hh" #include "../lout/debug.hh"
#include "../lout/msg.h" #include "../lout/msg.h"

2
dw/fltkplatform.cc
View File

@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/msg.h" #include "../lout/msg.h"
#include "../lout/debug.hh" #include "../lout/debug.hh"
#include "fltkcore.hh" #include "fltkcore.hh"

2
dw/fltkui.cc
View File

@ -25,7 +25,7 @@
#include "fltkcore.hh" #include "fltkcore.hh"
#include "fltkflatview.hh" #include "fltkflatview.hh"
#include "fltkcomplexbutton.hh" #include "fltkcomplexbutton.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/msg.h" #include "../lout/msg.h"
#include "../lout/misc.hh" #include "../lout/misc.hh"

2
dw/hyphenator.cc
View File

@ -21,7 +21,7 @@
#include "hyphenator.hh" #include "hyphenator.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/misc.hh" #include "../lout/misc.hh"
#include "../lout/unicode.hh" #include "../lout/unicode.hh"
#include <limits.h> #include <limits.h>

2
dw/image.cc
View File

@ -22,7 +22,7 @@
//#define DEBUG_LEVEL 1 //#define DEBUG_LEVEL 1
#include "image.hh" #include "image.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/msg.h" #include "../lout/msg.h"
#include "../lout/misc.hh" #include "../lout/misc.hh"
#include "../lout/debug.hh" #include "../lout/debug.hh"

2
dw/layout.cc
View File

@ -22,7 +22,7 @@
#include "core.hh" #include "core.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "../lout/msg.h" #include "../lout/msg.h"
#include "../lout/debug.hh" #include "../lout/debug.hh"
#include "../lout/misc.hh" #include "../lout/misc.hh"

2
dw/style.cc
View File

@ -26,7 +26,7 @@ static_assert( __cplusplus > 2020'02 );
#include <algorithm> #include <algorithm>
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "core.hh" #include "core.hh"
#include "../lout/msg.h" #include "../lout/msg.h"

2
lout/misc.hh
View File

@ -26,7 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "dlib/dlib.h" #include "dlib/dlib.hh"
namespace lout { namespace lout {

2
lout/object.cc
View File

@ -20,7 +20,7 @@
#include "object.hh" #include "object.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <config.h> #include <config.h>

2
src/IO/IO.cc
View File

@ -18,7 +18,7 @@
#include <unistd.h> #include <unistd.h>
#include "../msg.hh" #include "../msg.hh"
#include "../chain.hh" #include "../chain.hh"
#include "../klist.h" #include "../klist.hh"
#include "IO.hh" #include "IO.hh"
#include "iowatch.hh" #include "iowatch.hh"
#include "tls.hh" #include "tls.hh"

2
src/IO/IO.hh
View File

@ -4,7 +4,7 @@
#include <string_view> #include <string_view>
#include "d_size.h" #include "d_size.h"
#include "../../dlib/dlib.h" #include "../../dlib/dlib.hh"
#include "../chain.hh" #include "../chain.hh"
/* /*

2
src/IO/Url.h
View File

@ -3,7 +3,7 @@
#include "../chain.hh" #include "../chain.hh"
#include "../url.hh" #include "../url.hh"
#include "../../dlib/dlib.h" #include "../../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
src/IO/dpi.cc
View File

@ -36,11 +36,11 @@
#include <netdb.h> #include <netdb.h>
#include "../msg.hh" #include "../msg.hh"
#include "../klist.h" #include "../klist.hh"
#include "IO.hh" #include "IO.hh"
#include "Url.h" #include "Url.h"
#include "../../dpip/dpip.h" #include "../../dpip/dpip.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
/* This one is tricky, some sources state it should include the byte /* This one is tricky, some sources state it should include the byte
* for the terminating NULL, and others say it shouldn't. */ * for the terminating NULL, and others say it shouldn't. */

2
src/IO/http.cc
View File

@ -32,7 +32,7 @@
#include "tls.hh" #include "tls.hh"
#include "Url.h" #include "Url.h"
#include "../msg.hh" #include "../msg.hh"
#include "../klist.h" #include "../klist.hh"
#include "../dns.hh" #include "../dns.hh"
#include "../web.hh" #include "../web.hh"
#include "../cookies.hh" #include "../cookies.hh"

4
src/IO/mime.hh
View File

@ -14,13 +14,13 @@
#include <config.h> #include <config.h>
#include "../cache.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "../cache.hh"
typedef void* (*Viewer_t) (const char*, void*, CA_Callback_t*, void**); typedef void* (*Viewer_t) (const char*, void*, CA_Callback_t*, void**);
/** /**

4
src/IO/tls_openssl.cc
View File

@ -45,9 +45,9 @@
#include <ctype.h> /* tolower for wget stuff */ #include <ctype.h> /* tolower for wget stuff */
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include "../../dlib/dlib.h" #include "../../dlib/dlib.hh"
#include "../dialog.hh" #include "../dialog.hh"
#include "../klist.h" #include "../klist.hh"
#include "iowatch.hh" #include "iowatch.hh"
#include "tls.hh" #include "tls.hh"
#include "Url.h" #include "Url.h"

4
src/IO/tls_openssl.hh
View File

@ -25,12 +25,12 @@
#ifndef __TLS_OPENSSL_H__ #ifndef __TLS_OPENSSL_H__
#define __TLS_OPENSSL_H__ #define __TLS_OPENSSL_H__
#include "../url.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "../url.hh"
const char *a_Tls_openssl_version(char *buf, int n); const char *a_Tls_openssl_version(char *buf, int n);
void a_Tls_openssl_init(void); void a_Tls_openssl_init(void);
int a_Tls_openssl_certificate_is_clean(const DilloUrl *url); int a_Tls_openssl_certificate_is_clean(const DilloUrl *url);

4
src/Makefile.am
View File

@ -68,8 +68,8 @@ flenser_SOURCES = \
url.hh \ url.hh \
bitvec.cc \ bitvec.cc \
bitvec.hh \ bitvec.hh \
klist.c \ klist.cc \
klist.h \ klist.hh \
chain.cc \ chain.cc \
chain.hh \ chain.hh \
utf8.cc \ utf8.cc \

2
src/actions.cc
View File

@ -11,7 +11,7 @@
#include "actions.hh" #include "actions.hh"
#include "msg.hh" #include "msg.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include <errno.h> #include <errno.h>
static Dlist *link_actions = NULL; static Dlist *link_actions = NULL;

4
src/actions.hh
View File

@ -12,12 +12,12 @@
#ifndef ACTIONS_H #ifndef ACTIONS_H
#define ACTIONS_H #define ACTIONS_H
#include "dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "dlib/dlib.h"
typedef struct { typedef struct {
char *label; char *label;
char *cmd; char *cmd;

2
src/auth.cc
View File

@ -23,7 +23,7 @@
#include "misc.hh" #include "misc.hh"
#include "dialog.hh" #include "dialog.hh"
#include "digest.hh" #include "digest.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
typedef struct { typedef struct {
int ok; int ok;

2
src/bitvec.cc
View File

@ -13,7 +13,7 @@
* A simple ADT for bit arrays * A simple ADT for bit arrays
*/ */
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "bitvec.hh" #include "bitvec.hh"
extern "C" { extern "C" {

2
src/bookmark.cc
View File

@ -15,7 +15,7 @@
#include "history.hh" #include "history.hh"
#include "capi.hh" #include "capi.hh"
#include "bookmark.hh" /* for prototypes */ #include "bookmark.hh" /* for prototypes */
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"

9
src/cache.hh
View File

@ -1,14 +1,15 @@
#ifndef __CACHE_H__ #ifndef __CACHE_H__
#define __CACHE_H__ #define __CACHE_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "chain.hh" #include "chain.hh"
#include "url.hh" #include "url.hh"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* /*
* Cache Op codes * Cache Op codes
*/ */

2
src/capi.cc
View File

@ -31,7 +31,7 @@
#include "dpiapi.hh" #include "dpiapi.hh"
#include "uicmd.hh" #include "uicmd.hh"
#include "domain.hh" #include "domain.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
#include "prefs.hh" #include "prefs.hh"
/* for testing dpi chat */ /* for testing dpi chat */

2
src/chain.cc
View File

@ -15,7 +15,7 @@
#include "msg.hh" #include "msg.hh"
#include "chain.hh" #include "chain.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#define VERBOSE 0 #define VERBOSE 0

2
src/cookies.cc
View File

@ -43,7 +43,7 @@ void a_Cookies_init(void)
#include "list.h" #include "list.h"
#include "cookies.hh" #include "cookies.hh"
#include "capi.hh" #include "capi.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
/** The maximum length of a line in the cookie file */ /** The maximum length of a line in the cookie file */

2
src/css.cc
View File

@ -10,7 +10,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "msg.hh" #include "msg.hh"
#include "html_common.hh" #include "html_common.hh"
#include "css.hh" #include "css.hh"

2
src/decode.hh
View File

@ -1,7 +1,7 @@
#ifndef __DECODE_H__ #ifndef __DECODE_H__
#define __DECODE_H__ #define __DECODE_H__
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
src/dgif.hh
View File

@ -1,13 +1,13 @@
#ifndef __GIF_H__ #ifndef __GIF_H__
#define __GIF_H__ #define __GIF_H__
#include "url.hh"
#include "image.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "url.hh"
#include "image.hh"
struct DilloGif; struct DilloGif;
DilloGif *a_Gif_new(DilloImage *Image, DilloUrl *url, int version); DilloGif *a_Gif_new(DilloImage *Image, DilloUrl *url, int version);

2
src/dialog.cc
View File

@ -37,7 +37,7 @@
#include "dialog.hh" #include "dialog.hh"
#include "misc.hh" #include "misc.hh"
#include "prefs.hh" #include "prefs.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
/* /*
* Local Data * Local Data

2
src/digest.cc
View File

@ -13,7 +13,7 @@
#include "digest.hh" #include "digest.hh"
#include "md5.h" #include "md5.h"
#include "msg.hh" #include "msg.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include <string_view> #include <string_view>

2
src/digest.hh
View File

@ -2,7 +2,7 @@
#define __DIGEST_H__ #define __DIGEST_H__
#include "auth.hh" #include "auth.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

7
src/djpeg.hh
View File

@ -1,13 +1,14 @@
#ifndef __JPEG_H__ #ifndef __JPEG_H__
#define __JPEG_H__ #define __JPEG_H__
#include "url.hh"
#include "image.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "url.hh"
#include "image.hh"
void *a_Jpeg_new(DilloImage *Image, DilloUrl *url, int version); void *a_Jpeg_new(DilloImage *Image, DilloUrl *url, int version);
void a_Jpeg_callback(int Op, void *data); void a_Jpeg_callback(int Op, void *data);

2
src/domain.cc
View File

@ -12,7 +12,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "msg.hh" #include "msg.hh"
#include "list.h" #include "list.h"
#include "domain.hh" #include "domain.hh"

2
src/dpiapi.cc
View File

@ -18,7 +18,7 @@
#include "capi.hh" #include "capi.hh"
#include "dpiapi.hh" /* for prototypes */ #include "dpiapi.hh" /* for prototypes */
#include "dialog.hh" #include "dialog.hh"
#include "../dpip/dpip.h" #include "../dpip/dpip.hh"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

8
src/dpng.hh
View File

@ -1,16 +1,16 @@
#ifndef __PNG_H__ #ifndef __PNG_H__
#define __PNG_H__ #define __PNG_H__
#include "url.hh"
#include "image.hh"
#include "cache.hh"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#else #else
#error PNG header is now C++ only #error PNG header is now C++ only
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "url.hh"
#include "image.hh"
#include "cache.hh"
struct DilloPng; struct DilloPng;
DilloPng *a_Png_new(DilloImage *Image, DilloUrl *url, int version); DilloPng *a_Png_new(DilloImage *Image, DilloUrl *url, int version);

8
src/dsvg.hh
View File

@ -1,14 +1,14 @@
#ifndef __SVG_H__ #ifndef __SVG_H__
#define __SVG_H__ #define __SVG_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "url.hh" #include "url.hh"
#include "image.hh" #include "image.hh"
#include "cache.hh" #include "cache.hh"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
void *a_Svg_new(DilloImage *Image, DilloUrl *url, int version); void *a_Svg_new(DilloImage *Image, DilloUrl *url, int version);
void a_Svg_callback(int Op, CacheClient_t *Client); void a_Svg_callback(int Op, CacheClient_t *Client);

7
src/dwebp.hh
View File

@ -1,14 +1,15 @@
#ifndef __WEBP_H__ #ifndef __WEBP_H__
#define __WEBP_H__ #define __WEBP_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "url.hh" #include "url.hh"
#include "image.hh" #include "image.hh"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
void *a_Webp_new(DilloImage *Image, DilloUrl *url, int version); void *a_Webp_new(DilloImage *Image, DilloUrl *url, int version);
void a_Webp_callback(int Op, void *data); void a_Webp_callback(int Op, void *data);
const char *a_Webp_version(char *buf, int n); const char *a_Webp_version(char *buf, int n);

2
src/form.cc
View File

@ -20,7 +20,7 @@
#include "dw/core.hh" #include "dw/core.hh"
#include "dw/textblock.hh" #include "dw/textblock.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "misc.hh" #include "misc.hh"
#include "msg.hh" #include "msg.hh"
#include "prefs.hh" #include "prefs.hh"

2
src/hsts.cc
View File

@ -31,7 +31,7 @@
#include "hsts.hh" #include "hsts.hh"
#include "msg.hh" #include "msg.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "IO/tls.hh" #include "IO/tls.hh"
#include <string> #include <string>

2
src/keys.cc
View File

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "keys.hh" #include "keys.hh"
#include "utf8.hh" #include "utf8.hh"
#include "msg.hh" #include "msg.hh"

2
src/klist.c → src/klist.cc
View File

@ -18,7 +18,7 @@
* remains with the caller. * remains with the caller.
*/ */
#include "klist.h" #include "klist.hh"
/** /**

2
src/klist.h → src/klist.hh
View File

@ -1,7 +1,7 @@
#ifndef __KLIST_H__ #ifndef __KLIST_H__
#define __KLIST_H__ #define __KLIST_H__
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#ifdef __cplusplus #ifdef __cplusplus

2
src/paths.cc
View File

@ -14,7 +14,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "msg.hh" #include "msg.hh"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "paths.hh" #include "paths.hh"
/* /*

2
src/styleengine.cc
View File

@ -10,7 +10,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
#include "msg.hh" #include "msg.hh"
#include "prefs.hh" #include "prefs.hh"
#include "misc.hh" #include "misc.hh"

2
src/tipwin.cc
View File

@ -27,7 +27,7 @@
#include "prefs.hh" #include "prefs.hh"
#include "tipwin.hh" #include "tipwin.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
/* /*
* Forward declarations * Forward declarations

2
src/uicmd.cc
View File

@ -46,7 +46,7 @@
#include "msg.hh" #include "msg.hh"
#include "prefs.hh" #include "prefs.hh"
#include "misc.hh" #include "misc.hh"
#include "dlib/dlib.h" #include "dlib/dlib.hh"
#include "dw/fltkviewport.hh" #include "dw/fltkviewport.hh"

2
src/url.hh
View File

@ -13,7 +13,7 @@
#define __URL_H__ #define __URL_H__
#include "d_size.h" #include "d_size.h"
#include "../dlib/dlib.h" #include "../dlib/dlib.hh"
extern "C++" extern "C++"
{ {

2
src/utf8.cc
View File

@ -11,7 +11,7 @@
#include <FL/fl_utf8.h> #include <FL/fl_utf8.h>
#include "../dlib/dlib.h" /* TRUE/FALSE */ #include "../dlib/dlib.hh" /* TRUE/FALSE */
#include "utf8.hh" #include "utf8.hh"
// C++ functions with C linkage ---------------------------------------------- // C++ functions with C linkage ----------------------------------------------