Changeset 7258c6a in buchla-68k for ram/scread.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/scread.c (modified) (5 diffs)

ram/scread.c

@@ -16 +16 @@
 #include "libdsp.h"
 
-extern  short   scskip(FILE *fp, short ns);
-
-extern  long    schksum;                /* score checksum */
-
-extern  int     errno;                  /* system error number */
-extern  short   lderrsw;                /* librarian error message switch */
-extern  short   lrasw;                  /* "Content" switch */
-
-extern  short   ldmap[];                /* librarian gather-read map */
+extern  int16_t scskip(FILE *fp, int16_t ns);
+
+extern  int32_t schksum;                /* score checksum */
+
+extern  int16_t errno;                  /* system error number */
+extern  int16_t lderrsw;                /* librarian error message switch */
+extern  int16_t lrasw;                  /* "Content" switch */
+
+extern  int16_t ldmap[];                /* librarian gather-read map */
 
 extern  struct  s_entry *libsp;         /* librarian score insert pointer */
@@ -40 +40 @@
 */
 
-void scioerr(short sn, struct s_entry *ep)
+void scioerr(int16_t sn, struct s_entry *ep)
 {
-        char scid[40];
-        char erms[40];
+        int8_t scid[40];
+        int8_t erms[40];
 
         if (E_NULL NE ep)
@@ -64 +64 @@
 */
 
-void noevent(int sn)
+void noevent(int16_t sn)
 {
-        char scid[24];
+        int8_t scid[24];
 
         sc_clr(sn);
@@ -87 +87 @@
 */
 
-short scread(short ns, FILE *fp)
+int16_t scread(int16_t ns, FILE *fp)
 {
         register struct s_entry *ep;
-        register short ehdr, go, sn;
-        long nbr, nev;
-        char etype;
-        char scid[40];
-        char erms[40];
+        register int16_t ehdr, go, sn;
+        int32_t nbr, nev;
+        int8_t etype;
+        int8_t scid[40];
+        int8_t erms[40];
 
         sn = ldmap[ns];         /* map the score */
@@ -160 +160 @@
         }
 
-        if (rd_ec(fp, &stimes[sn], (long)(N_SECTS * 12))) { /* section times */
+        if (rd_ec(fp, &stimes[sn], (int32_t)(N_SECTS * 12))) { /* section times */
 
                 scioerr(sn, 0L);