Skip to content

Commit 475b5af

Browse files
committed
Update Xcode project, update copyright in GUI.
1 parent 23c960a commit 475b5af

File tree

8 files changed

+40
-535
lines changed

8 files changed

+40
-535
lines changed

htmldoc/http-addrlist.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -491,19 +491,19 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p
491491
/* Global data */
492492

493493

494-
#ifdef DEBUG
495-
_cups_debug_printf("httpAddrGetList(hostname=\"%s\", family=AF_%s, "
496-
"service=\"%s\")\n",
497-
hostname ? hostname : "(nil)",
498-
family == AF_UNSPEC ? "UNSPEC" :
499-
# ifdef AF_LOCAL
500-
family == AF_LOCAL ? "LOCAL" :
501-
# endif /* AF_LOCAL */
502-
# ifdef AF_INET6
503-
family == AF_INET6 ? "INET6" :
504-
# endif /* AF_INET6 */
505-
family == AF_INET ? "INET" : "???", service);
506-
#endif /* DEBUG */
494+
//#ifdef DEBUG
495+
// _cups_debug_printf("httpAddrGetList(hostname=\"%s\", family=AF_%s, "
496+
// "service=\"%s\")\n",
497+
// hostname ? hostname : "(nil)",
498+
// family == AF_UNSPEC ? "UNSPEC" :
499+
//# ifdef AF_LOCAL
500+
// family == AF_LOCAL ? "LOCAL" :
501+
//# endif /* AF_LOCAL */
502+
//# ifdef AF_INET6
503+
// family == AF_INET6 ? "INET6" :
504+
//# endif /* AF_INET6 */
505+
// family == AF_INET ? "INET" : "???", service);
506+
//#endif /* DEBUG */
507507

508508
#if 0
509509
#ifdef HAVE_RES_INIT

htmldoc/http-support.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1758,7 +1758,7 @@ _httpResolveURI(
17581758
#endif /* DEBUG */
17591759

17601760

1761-
DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, CUPS_LLCAST resolved_size, options, (void *)cb, context));
1761+
DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" HTMLDOC_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, HTMLDOC_LLCAST resolved_size, options, (void *)cb, context));
17621762

17631763
/*
17641764
* Get the device URI...

htmldoc/license.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ GUI::showLicenseCB(void)
5959
group->labelsize(18);
6060

6161
box = new Fl_Box(20, 45, 600, 110,
62-
"Copyright © 2011-2020 by Michael R Sweet.\n\n"
62+
"Copyright © 2011-2022 by Michael R Sweet.\n\n"
6363
"HTMLDOC is provided under the terms of the GNU General Public License and "
6464
"comes with absolutely no warranty. Please report problems on the Github "
6565
"issues page at:\n\n"

htmldoc/mmd.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
* Define DEBUG to get debug printf messages to stderr.
1414
*/
1515

16-
#define DEBUG 0
16+
#ifndef DEBUG
17+
# define DEBUG 0
18+
#endif // !DEBUG
1719
#if DEBUG > 0
1820
# define DEBUG_printf(...) fprintf(stderr, __VA_ARGS__)
1921
# define DEBUG_puts(s) fputs(s, stderr);

htmldoc/ps-pdf.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3911,15 +3911,15 @@ parse_contents(tree_t *t, /* I - Tree to parse */
39113911
{
39123912
pages[*page].chapter = htmlGetText(t->child->child);
39133913

3914-
for (int i = *page + 1; i < num_pages; i ++)
3914+
for (int i = *page + 1; i < (int)num_pages; i ++)
39153915
pages[i].chapter = pages[*page].chapter;
39163916
}
39173917

39183918
if (pages[*page].heading == pages[*page - 1].heading)
39193919
{
39203920
pages[*page].heading = htmlGetText(t->child->child);
39213921

3922-
for (int i = *page + 1; i < num_pages; i ++)
3922+
for (int i = *page + 1; i < (int)num_pages; i ++)
39233923
pages[i].heading = pages[*page].heading;
39243924
}
39253925

@@ -4610,7 +4610,7 @@ parse_heading(tree_t *t, /* I - Tree to parse */
46104610
{
46114611
pages[*page].chapter = htmlGetText(current_heading);
46124612

4613-
for (int i = *page + 1; i < num_pages; i ++)
4613+
for (int i = *page + 1; i < (int)num_pages; i ++)
46144614
pages[i].chapter = pages[*page].chapter;
46154615
}
46164616

@@ -4621,7 +4621,7 @@ parse_heading(tree_t *t, /* I - Tree to parse */
46214621
pages[*page].heading = htmlGetText(current_heading);
46224622
pages[*page].headnode = current_heading;
46234623

4624-
for (int i = *page + 1; i < num_pages; i ++)
4624+
for (int i = *page + 1; i < (int)num_pages; i ++)
46254625
{
46264626
pages[i].heading = pages[*page].heading;
46274627
pages[i].headnode = current_heading;

htmldoc/tls-darwin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ httpCredentialsString(
449449
SecCertificateRef secCert; /* Certificate reference */
450450

451451

452-
DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" CUPS_LLFMT ")", (void *)credentials, (void *)buffer, CUPS_LLCAST bufsize));
452+
DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" HTMLDOC_LLFMT ")", (void *)credentials, (void *)buffer, HTMLDOC_LLCAST bufsize));
453453

454454
if (!buffer)
455455
return (0);

htmldoc/zipc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ zipcFileRead(zipc_file_t *zf, /* I - ZIP container file */
624624
if (zc->readptr && zc->readptr < zc->readend)
625625
{
626626
rbytes = zc->readend - zc->readptr;
627-
if (rbytes > bytes)
628-
rbytes = bytes;
627+
if (rbytes > (ssize_t)bytes)
628+
rbytes = (ssize_t)bytes;
629629

630630
memcpy(data, zc->readptr, rbytes);
631631
zc->readptr += rbytes;

xcode/htmldoc.xcodeproj/project.pbxproj

Lines changed: 15 additions & 512 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)