Changeset 7258c6a in buchla-68k for ram/ldfield.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/ldfield.c (modified) (8 diffs)

ram/ldfield.c

@@ -24 +24 @@
 
 extern  void    select(void);
-extern  short   whatbox(void);
+extern  int16_t whatbox(void);
 extern  void    nokey(void);
-extern  short   nonf(short k);
+extern  int16_t nonf(int16_t k);
 extern  void    cxkstd(void);
 extern  void    cykstd(void);
 extern  void    stdmkey(void);
-extern  short   et_null(short n);
-extern  short   ef_null(short n);
-extern  short   rd_null(short n);
-extern  short   nd_null(short n, short k);
+extern  int16_t et_null(int16_t n);
+extern  int16_t ef_null(int16_t n);
+extern  int16_t rd_null(int16_t n);
+extern  int16_t nd_null(int16_t n, int16_t k);
 extern  void    lmwclr(void);
-extern  void    vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch);
-extern  short   ftkind(short ns);
+extern  void    vcputsv(int16_t *obase, int16_t nw, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *str, int16_t pitch);
+extern  int16_t ftkind(int16_t ns);
 extern  void    _clsvol(void);
-extern  short   lcancel(short lct);
-extern  short   stdctp0(void);
-extern  short   ldline(short cy);
-extern  short   lin2slt(short line);
-extern  void    dslslot(short slot, unsigned fg, short row);
-extern  short   putcat(void);
-extern  short   showcat(void);
-extern  int     showsiz(void);
-
-extern  unsigned        exp_c(unsigned c);
-
-extern  void    *memset(void *vp, char c, int n);
-extern  char    *slotnam(unsigned slot, unsigned kind);
+extern  int16_t lcancel(int16_t lct);
+extern  int16_t stdctp0(void);
+extern  int16_t ldline(int16_t cy);
+extern  int16_t lin2slt(int16_t line);
+extern  void    dslslot(int16_t slot, uint16_t fg, int16_t row);
+extern  int16_t putcat(void);
+extern  int16_t showcat(void);
+extern  int16_t showsiz(void);
+
+extern  uint16_t        exp_c(uint16_t c);
+
+extern  void    *memset(void *vp, int8_t c, int16_t n);
+extern  int8_t  *slotnam(uint16_t slot, uint16_t kind);
 
 /* 
@@ -60 +60 @@
 #endif
 
-extern  short   astat;
-extern  short   catin;
-extern  short   cmfirst;
-extern  short   cxrate;
-extern  short   cxval;
-extern  short   cyrate;
-extern  short   cyval;
-extern  short   ldelsw;
-extern  short   lderrsw;
-extern  short   ldkind;
-extern  short   ldpass;
-extern  short   ldrow;
-extern  short   ldslot;
-extern  short   lmwtype;
-extern  short   loadrow;
-extern  short   loadsw;
-extern  short   lorchl;
-extern  short   lrasw;
-extern  short   lselsw;
-extern  short   ltagged;
-extern  short   ndisp;
-extern  short   oldltag;
-extern  short   oldpk;
-extern  short   oldsl;
-extern  short   pkctrl;
-extern  short   sliders;
-extern  short   stcrow;
-extern  short   stccol;
-extern  short   submenu;
-extern  short   tagslot;
-extern  short   thcwval;
-extern  short   tvcwval;
-
-extern  unsigned *librob;
-
-extern  char    bfs[];
-extern  char    ldfile[];
-extern  char    ldcmnt[];
-
-extern  short   crate1[];
-extern  short   ldmap[];
+extern  int16_t astat;
+extern  int16_t catin;
+extern  int16_t cmfirst;
+extern  int16_t cxrate;
+extern  int16_t cxval;
+extern  int16_t cyrate;
+extern  int16_t cyval;
+extern  int16_t ldelsw;
+extern  int16_t lderrsw;
+extern  int16_t ldkind;
+extern  int16_t ldpass;
+extern  int16_t ldrow;
+extern  int16_t ldslot;
+extern  int16_t lmwtype;
+extern  int16_t loadrow;
+extern  int16_t loadsw;
+extern  int16_t lorchl;
+extern  int16_t lrasw;
+extern  int16_t lselsw;
+extern  int16_t ltagged;
+extern  int16_t ndisp;
+extern  int16_t oldltag;
+extern  int16_t oldpk;
+extern  int16_t oldsl;
+extern  int16_t pkctrl;
+extern  int16_t sliders;
+extern  int16_t stcrow;
+extern  int16_t stccol;
+extern  int16_t submenu;
+extern  int16_t tagslot;
+extern  int16_t thcwval;
+extern  int16_t tvcwval;
+
+extern  uint16_t *librob;
+
+extern  int8_t  bfs[];
+extern  int8_t  ldfile[];
+extern  int8_t  ldcmnt[];
+
+extern  int16_t crate1[];
+extern  int16_t ldmap[];
 
 extern  LPF     (*swpt)[];
@@ -113 +113 @@
 void    ldxkey(void);
 void    ldmkey(void);
-void    ldkey(short k);
+void    ldkey(int16_t k);
 void    ldcxupd(void);
 void    ldcyupd(void);
@@ -129 +129 @@
 };
 
-short   ldbox[][8] = {  /* display box parameters */
+int16_t ldbox[][8] = {  /* display box parameters */
 
         {  1,   1, 510,  13, LCFBX00, LCBBX00,  0,  1}, /*  0 - index area label */
@@ -144 +144 @@
 };
 
-char    *ldbxlb0[] = {  /* display box labels */
+int8_t  *ldbxlb0[] = {  /* display box labels */
 
         "RecrdType L FileName Comment                               Mem", /*  0 */
@@ -200 +200 @@
 void ldxkey(void)
 {
-        register char *fn;
-        register short slot;
-        char buf[4];
+        register int8_t *fn;
+        register int16_t slot;
+        int8_t buf[4];
 
         if (NOT astat)          /* only on key closure */
@@ -456 +456 @@
 */
 
-void loadem(short key)
-{
-        register short c, i, rc, slot;
+void loadem(int16_t key)
+{
+        register int16_t c, i, rc, slot;
 
         rc = FALSE;
@@ -502 +502 @@
 */
 
-void ldkey(short k)
-{
-        register short c, col, row, slot;
-        char buf[4];
+void ldkey(int16_t k)
+{
+        register int16_t c, col, row, slot;
+        int8_t buf[4];
 
         if (NOT astat)                          /* only on key closure */