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

ram/chksec.c

@@ -15 +15 @@
 #include "secdefs.h"
 
-extern  short   ancmsw;
-extern  short   grptran;
-
-extern  short   grpmode[];
-extern  short   grpstat[];
-extern  short   grptmap[];
-
-extern  short   varmode[][16];
-
-short   cmslens[N_ETYPES] = {   /* score event sizes for copy / merge */
+extern  int16_t ancmsw;
+extern  int16_t grptran;
+
+extern  int16_t grpmode[];
+extern  int16_t grpstat[];
+extern  int16_t grptmap[];
+
+extern  int16_t varmode[][16];
+
+int16_t cmslens[N_ETYPES] = {   /* score event sizes for copy / merge */
 
         0,      /*  0 - EV_NULL         not copied or merged */
@@ -57 +57 @@
 */
 
-char    cmgtags[N_ETYPES] = {   /* score event group sensitivity tags */
+int8_t  cmgtags[N_ETYPES] = {   /* score event group sensitivity tags */
 
         FALSE,  /*  0 - EV_NULL         not copied or merged */
@@ -90 +90 @@
 */
 
-char    cmgtype[N_ETYPES] = {   /* score event group types for copy / merge */
+int8_t  cmgtype[N_ETYPES] = {   /* score event group types for copy / merge */
 
         0,      /*  0 - EV_NULL         not copied or merged */
@@ -123 +123 @@
 */
 
-short   ehdlist[N_ETYPES] = {           /* hplist update type table */
+int16_t ehdlist[N_ETYPES] = {           /* hplist update type table */
 
         -1,             /*  0 - EV_NULL */
@@ -167 +167 @@
 */
 
-short oktocm(struct s_entry *ep)
-{
-        register short et, grp, mode;
+int16_t oktocm(struct s_entry *ep)
+{
+        register int16_t et, grp, mode;
 
         et = 0x007F & ep->e_type;               /* get event type */
@@ -213 +213 @@
 */
 
-short oktode(struct s_entry *ep)
-{
-        register short et, grp, mode;
+int16_t oktode(struct s_entry *ep)
+{
+        register int16_t et, grp, mode;
 
         et = 0x007F & ep->e_type;               /* get event type */
@@ -258 +258 @@
 */
 
-short oktodg(struct s_entry *ep)
-{
-        register short et, grp;
+int16_t oktodg(struct s_entry *ep)
+{
+        register int16_t et, grp;
 
         et = 0x007F & ep->e_type;       /* get event type */
@@ -294 +294 @@
 */
 
-short chksec(short ns)
+int16_t chksec(int16_t ns)
 {
         register struct s_entry *ep;
@@ -365 +365 @@
 */
 
-long sizesec(void)
-{
-        register long ec;
-        register short et;
+int32_t sizesec(void)
+{
+        register int32_t ec;
+        register int16_t et;
         register struct s_entry *sbp, *sep;
 
@@ -412 +412 @@
 */
 
-void edelta(struct s_entry *ep, long btime, long delta)
+void edelta(struct s_entry *ep, int32_t btime, int32_t delta)
 {
         DB_ENTR("edelta");
@@ -447 +447 @@
 */
 
-struct s_entry *madjsec(struct s_entry *sbp, long btime)
-{
-        short ns, nv;
-        register short grp, es, et;
+struct s_entry *madjsec(struct s_entry *sbp, int32_t btime)
+{
+        int16_t ns, nv;
+        register int16_t grp, es, et;
         register struct s_entry *ep, *np;
         struct s_entry *cp;
-        register long sat;
+        register int32_t sat;
 
         DB_ENTR("madjsec");
@@ -577 +577 @@
 void ehfix(struct s_entry *cbp, struct s_entry *cep)
 {
-        register short et;
+        register int16_t et;
 
         for (;;) {      /* for each event from cbp to cep ... */