Skip to content

Commit 1723025

Browse files
markpizzmarkpizz
committed
PDFLPT: Compiler warning and error cleanup
1 parent ce56a60 commit 1723025

File tree

6 files changed

+38
-37
lines changed

6 files changed

+38
-37
lines changed

‎Ibm1130/ibm1130_prt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ static t_stat prt_detach (UNIT *uptr)
834834
}
835835

836836
static t_stat set_prt_type (UNIT *uptr, int32 val, char *cptr, void *desc) {
837-
size_t ncol;
837+
int ncol;
838838
char tbuf[sizeof ("columns=999")];
839839

840840
if (val == 0) {

‎PDP11/pdp11_lp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,12 @@ if (LPT_WIDTH != 132) {
536536
sprintf (tbuf + strlen (tbuf), " columns=%u", LPT_WIDTH);
537537
}
538538
if (tof != 0) {
539-
sprintf (tbuf + strlen (tbuf), " tof-offset=%u", tof);
539+
sprintf (tbuf + strlen (tbuf), " tof-offset=%d", (int)tof);
540540
}
541541

542542
i = vfu_length? vfu_length : last_vfu_length;
543543
if (i) {
544-
sprintf (tbuf + strlen (tbuf), " lpp=%u", i);
544+
sprintf (tbuf + strlen (tbuf), " lpp=%d", (int)i);
545545

546546
}
547547
pdflpt_set_defaults (uptr, tbuf);
@@ -552,7 +552,7 @@ if (pdflpt_getmode (uptr) == PDFLPT_IS_PDF) {
552552
last_vfu_length = vfu_length;
553553
sprintf (tbuf, "lpp=%u", vfu_length);
554554
if (tof != 0) {
555-
sprintf (tbuf + strlen (tbuf), " tof-offset=%u", tof);
555+
sprintf (tbuf + strlen (tbuf), " tof-offset=%d", (int)tof);
556556
}
557557
}
558558
if ((lpi & LPI_SET) && lpi != last_lpi) {
@@ -633,7 +633,7 @@ sum = 0;
633633
for (l = 0; l < vfu_length; l++) {
634634
if (l && !(l % 5))
635635
fputc ('\n', st);
636-
fprintf (st, "%4u", l);
636+
fprintf (st, "%4d", (int)l);
637637
for (c = VFU_MAX; c >= 0; c--)
638638
fprintf (st, " %c", (vfu[l] & (1 << c))? ((c >= 9)? 'X': '1'+c) : ' ');
639639
fputc ('\n', st);

‎PDP11/txt2cbn.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#include <stdio.h>
2+
#include <stdlib.h>
23

34
#define ERROR 00404
45
#include "pdp11_cr_dat.h"
56

67
static int colStart = 1; /* starting column */
78
static int colEnd = 80; /* ending column */
89

9-
main ()
10+
void main ()
1011
{
1112
int col, c;
1213

‎lpt2pdf.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ static void wrhdr (PDF *pdf) {
26722672
pdf->flags |= PDF_WRITTEN;
26732673

26742674
fseek (pdf->pdf, pdf->anchorp, SEEK_SET);
2675-
fprintf (pdf->pdf, "%u 0 obj\n%.*s /Parent ", pdf->aobj, q - trail, trail);
2675+
fprintf (pdf->pdf, "%u 0 obj\n%.*s /Parent ", pdf->aobj, (int)(q - trail), trail);
26762676

26772677
/* From here on, the file has been written and is corrupt.
26782678
* Hopefully, a temporary condition, but errors will be permanent.
@@ -2842,14 +2842,14 @@ static void wrpage (PDF *pdf) {
28422842
*/
28432843
if ((pdf->flags & PDF_UNCOMPRESSED) || encstm (pdf, pdf->pagebuf, pdf->pbused)) {
28442844
fprintf (pdf->pdf, "%u 0 obj\n"
2845-
"<< /Length %u >>\n"
2846-
"stream\n", obj, pdf->pbused);
2845+
"<< /Length %d >>\n"
2846+
"stream\n", obj, (int)pdf->pbused);
28472847
fwrite (pdf->pagebuf, pdf->pbused, 1, pdf->pdf);
28482848
} else {
28492849
fprintf (pdf->pdf, "%u 0 obj\n"
2850-
" << /Length %u /DL %u /Filter /LZWDecode"
2850+
" << /Length %d /DL %d /Filter /LZWDecode"
28512851
" /DecodeParms << /EarlyChange 0 >> >>\n"
2852-
"stream\n", obj, pdf->lzwused, pdf->pbused);
2852+
"stream\n", obj, (int)pdf->lzwused, (int)pdf->pbused);
28532853
fwrite (pdf->lzwbuf, pdf->lzwused, 1, pdf->pdf);
28542854
}
28552855
fputs ("\nendstream\n"
@@ -3082,16 +3082,16 @@ static void imageform (PDF *pdf) {
30823082
*/
30833083

30843084
if ((pdf->flags & PDF_UNCOMPRESSED) || encstm (pdf, img.imgbuf, img.ibused)) {
3085-
fprintf (pdf->pdf, " /Length %u /Filter %s", img.ibused, img.filter);
3085+
fprintf (pdf->pdf, " /Length %d /Filter %s", (int)img.ibused, img.filter);
30863086
if (img.filterpars) {
30873087
fprintf (pdf->pdf, " /DecodeParms %s", img.filterpars);
30883088
}
30893089
fprintf (pdf->pdf, " >>\nstream\n");
30903090
fwrite (img.imgbuf, img.ibused, 1, pdf->pdf);
30913091
} else {
3092-
fprintf (pdf->pdf, " /Length %u /DL %u /Filter [ /LZWDecode %s ]\n"
3092+
fprintf (pdf->pdf, " /Length %d /DL %d /Filter [ /LZWDecode %s ]\n"
30933093
" /DecodeParms [ << /EarlyChange 0 >> %s ]",
3094-
pdf->lzwused, img.ibused, img.filter,
3094+
(int)pdf->lzwused, (int)img.ibused, img.filter,
30953095
(img.filterpars? img.filterpars: "null"));
30963096
fprintf (pdf->pdf, " >>\nstream\n");
30973097
fwrite (pdf->lzwbuf, pdf->lzwused, 1, pdf->pdf);

‎scp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7269,7 +7269,7 @@ static TOPIC *buildHelp (TOPIC *topic, struct sim_device *dptr,
72697269
if (dptr) {
72707270
char buf[129];
72717271
n = uptr? uptr - dptr->units: 0;
7272-
sprintf (buf, "%s%u", dptr->name, n);
7272+
sprintf (buf, "%s%u", dptr->name, (int)n);
72737273
appendText (topic, buf, strlen (buf));
72747274
}
72757275
break;
@@ -7654,7 +7654,7 @@ t_stat scp_vhelp (FILE *st, struct sim_device *dptr,
76547654
fprintf (stderr, "\nHelp was unable to process the help for this device.\n"
76557655
"Error in block %u line %u: %s\n"
76567656
"Please contact the device maintainer.\n",
7657-
help_where.block, help_where.line, help_where.error);
7657+
(int)help_where.block, (int)help_where.line, help_where.error);
76587658
cleanHelp (&top);
76597659
return failed;
76607660
}

‎sim_pdflpt.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ static t_stat lpt_idle_svc (UNIT *uptr);
147147
static t_stat lpt_idle_reset (DEVICE *dptr);
148148

149149
UNIT lpt_idle_unit = {UDATA (&lpt_idle_svc, UNIT_DIS, 0)};
150-
#define lpt_count ((uint32)lpt_idle_unit.u3)
151-
#define lpt_units ((UNIT **)lpt_idle_unit.up7)
150+
#define lpt_count (*((uint32 *)&lpt_idle_unit.u3))
151+
#define lpt_units (*((UNIT ***)&lpt_idle_unit.up7))
152152
DEVICE sim_lpt_idle = {
153153
"LPT-IDLE", &lpt_idle_unit, NULL, NULL, 1, 0, 0, 0, 0, 0,
154154
NULL, NULL, lpt_idle_reset};
@@ -681,21 +681,21 @@ t_stat pdflpt_attach (UNIT *uptr, char *cptr) {
681681

682682
if (!sim_quiet) {
683683
if (dptr->numunits > 1) {
684-
printf ("%s%u Ready at page %u line %u of %s\n",
685-
dptr->name, uptr - dptr->units, page, line,
684+
printf ("%s%d Ready at page %d line %d of %s\n",
685+
dptr->name, (int)(uptr - dptr->units), (int)page, (int)line,
686686
uptr->filename);
687687
if (sim_log) {
688-
fprintf (sim_log, "%s%u Ready at page %u line %u of %s\n",
689-
dptr->name, uptr - dptr->units, page, line,
688+
fprintf (sim_log, "%s%d Ready at page %d line %d of %s\n",
689+
dptr->name, (int)(uptr - dptr->units), (int)page, (int)line,
690690
uptr->filename);
691691
}
692692
} else {
693-
printf ("%s Ready at page %u line %u of %s\n",
694-
dptr->name, page, line,
693+
printf ("%s Ready at page %d line %d of %s\n",
694+
dptr->name, (int)page, (int)line,
695695
uptr->filename);
696696
if (sim_log) {
697-
fprintf (sim_log, "%s Ready at page %u line %u of %s\n",
698-
dptr->name, page, line,
697+
fprintf (sim_log, "%s Ready at page %d line %d of %s\n",
698+
dptr->name, (int)page, (int)line,
699699
uptr->filename);
700700
}
701701
}
@@ -860,9 +860,9 @@ t_stat pdflpt_detach (UNIT *uptr) {
860860
}
861861
r = SCPE_NOATT;
862862
} else if (!sim_quiet) {
863-
printf ( "Closed %s, on page %u\n", uptr->filename, page );
863+
printf ( "Closed %s, on page %d\n", uptr->filename, (int)page );
864864
if (sim_log) {
865-
fprintf (sim_log, "Closed %s, on page %u\n", uptr->filename, page );
865+
fprintf (sim_log, "Closed %s, on page %d\n", uptr->filename, (int)page );
866866
}
867867
}
868868

@@ -920,7 +920,7 @@ static t_stat spool_file (UNIT *uptr) {
920920
return SCPE_ARG;
921921

922922
if (dptr->numunits > 1) {
923-
sprintf (devname, "%s%u ", dptr->name, uptr - dptr->units);
923+
sprintf (devname, "%s%d ", dptr->name, (int)(uptr - dptr->units));
924924
} else {
925925
sprintf (devname, "%s ", dptr->name);
926926
}
@@ -1027,23 +1027,23 @@ static t_stat spool_file (UNIT *uptr) {
10271027
}
10281028
r = SCPE_OPENERR;
10291029
} else if (!sim_quiet) {
1030-
printf ("%sClosed %s, on page %u\n", devname,
1031-
uptr->filename, page );
1030+
printf ("%sClosed %s, on page %d\n", devname,
1031+
uptr->filename, (int)page );
10321032
if (sim_log) {
1033-
fprintf (sim_log, "%sClosed %s, on page %u\n", devname,
1034-
uptr->filename, page );
1033+
fprintf (sim_log, "%sClosed %s, on page %d\n", devname,
1034+
uptr->filename, (int)page );
10351035
}
10361036
}
10371037

10381038
pdf = newpdf;
10391039
strcpy (uptr->filename, newname);
10401040

10411041
if (!sim_quiet) {
1042-
printf ("%sReady at page %u line %u of %s\n",
1043-
devname, page, line, uptr->filename);
1042+
printf ("%sReady at page %d line %d of %s\n",
1043+
devname, (int)page, (int)line, uptr->filename);
10441044
if (sim_log) {
1045-
fprintf (sim_log, "%sReady at page %u line %u of %s\n",
1046-
devname, page, line, uptr->filename);
1045+
fprintf (sim_log, "%sReady at page %d line %d of %s\n",
1046+
devname, (int)page, (int)line, uptr->filename);
10471047
}
10481048
}
10491049

0 commit comments

Comments
 (0)