Run through clang-format.

This commit is contained in:
David Given 2016-08-21 20:08:05 +02:00
parent 44b6421519
commit 2b2bd93e44

View file

@ -8,7 +8,6 @@
* I C _ L I B . C
*/
#include <stdio.h>
#include <em_spec.h>
#include <em_pseu.h>
@ -23,29 +22,30 @@
#include "../share/files.h"
#include "ic_lib.h"
STATIC skip_string(n)
offset n;
offset n;
{
/* Read a string of length n and void it */
while (n--) {
while (n--)
{
readchar();
}
}
STATIC skip_arguments()
{
/* Skip the arguments of a MES pseudo. The argument
* list is terminated by a sp_cend byte.
*/
for (;;) {
switch(table2()) {
for (;;)
{
switch (table2())
{
case sp_scon:
get_off(); /* void */
/* fall through !!! */
/* fall through !!! */
case sp_icon:
case sp_ucon:
case sp_fcon:
@ -60,10 +60,7 @@ STATIC skip_arguments()
}
}
STATIC bool proc_wanted(name)
char *name;
STATIC bool proc_wanted(name) char* name;
{
/* See if 'name' is the name of an external procedure
* that has been used before, but for which no body
@ -72,18 +69,17 @@ STATIC bool proc_wanted(name)
proc_p p;
if (( p = proclookup(name,IMPORTING)) != (proc_p) 0 &&
!(p->p_flags1 & PF_BODYSEEN)) {
if ((p = proclookup(name, IMPORTING)) != (proc_p)0 && !(p->p_flags1 & PF_BODYSEEN))
{
return TRUE;
} else {
}
else
{
return FALSE;
}
}
STATIC bool data_wanted(name)
char *name;
STATIC bool data_wanted(name) char* name;
{
/* See if 'name' is the name of an externally visible
* data block that has been used before, but for which
@ -92,16 +88,16 @@ STATIC bool data_wanted(name)
dblock_p db;
if ((db = symlookup(name,IMPORTING)) != (dblock_p) 0 &&
db->d_pseudo == DUNKNOWN) {
if ((db = symlookup(name, IMPORTING)) != (dblock_p)0 && db->d_pseudo == DUNKNOWN)
{
return TRUE;
} else {
}
else
{
return FALSE;
}
}
STATIC bool wanted_names()
{
/* Read the names of procedures and data labels,
@ -114,10 +110,13 @@ STATIC bool wanted_names()
* no defining occurrence has been met.
*/
for (;;) {
switch(table2()) {
for (;;)
{
switch (table2())
{
case DLBX:
if (data_wanted(string)) {
if (data_wanted(string))
{
return TRUE;
}
/* A data entity with the name
@ -125,7 +124,8 @@ STATIC bool wanted_names()
*/
break;
case sp_pnam:
if (proc_wanted(string)) {
if (proc_wanted(string))
{
return TRUE;
}
break;
@ -137,9 +137,7 @@ STATIC bool wanted_names()
}
}
STATIC FILE *curfile = NULL;
STATIC FILE* curfile = NULL;
STATIC bool useful()
{
/* Determine if any entity imported by the current
@ -150,43 +148,45 @@ STATIC bool useful()
* of the entities imported.
*/
for (;;) {
if (table1() != PSEU || tabval != ps_mes) {
error("cannot find MES %d in library file",ms_ext);
for (;;)
{
if (table1() != PSEU || tabval != ps_mes)
{
error("cannot find MES %d in library file", ms_ext);
}
if (table2() != CSTX1) {
if (table2() != CSTX1)
{
error("message number expected");
}
if (tabval == ms_ext) {
if (tabval == ms_ext)
{
/* This is the one we searched */
return wanted_names();
/* Read the names of the imported entities
* and check if any of them is wanted.
*/
} else {
}
else
{
skip_arguments(); /* skip remainder of this MES */
}
}
}
STATIC bool is_archive(name)
char *name;
STATIC bool is_archive(name) char* name;
{
/* See if 'name' is the name of an archive file, i.e. it
* should end on ".ma" and should at least be four characters
* long (i.e. the name ".ma" is not accepted as an archive name!).
*/
register char *p;
register char* p;
for (p = name; *p; p++);
return (p > name+3) && (*--p == 'a') && (*--p == 'm') && (*--p == '.');
for (p = name; *p; p++)
;
return (p > name + 3) && (*--p == 'a') && (*--p == 'm') && (*--p == '.');
}
STATIC struct ar_hdr hdr;
STATIC bool read_hdr()
@ -194,39 +194,41 @@ STATIC bool read_hdr()
/* Read the header of an archive module */
char buf[AR_TOTAL];
register char *c = buf;
register char *p = hdr.ar_name;
register char* c = buf;
register char* p = hdr.ar_name;
register int i;
fread(c, AR_TOTAL, 1, curfile);
if (feof(curfile)) return 0;
if (feof(curfile))
return 0;
i = 14;
while (i--) {
while (i--)
{
*p++ = *c++;
}
#define get2(c) (((c)[0]&0377) | ((unsigned) ((c)[1]&0377) << 8))
#define get2(c) (((c)[0] & 0377) | ((unsigned)((c)[1] & 0377) << 8))
hdr.ar_date = ((long) get2(c)) << 16; c += 2;
hdr.ar_date |= ((long) get2(c)) & 0xffff; c += 2;
hdr.ar_date = ((long)get2(c)) << 16;
c += 2;
hdr.ar_date |= ((long)get2(c)) & 0xffff;
c += 2;
hdr.ar_uid = *c++;
hdr.ar_gid = *c++;
hdr.ar_mode = get2(c); c += 2;
hdr.ar_size = (long) get2(c) << 16; c += 2;
hdr.ar_size |= (long) get2(c) & 0xffff;
hdr.ar_mode = get2(c);
c += 2;
hdr.ar_size = (long)get2(c) << 16;
c += 2;
hdr.ar_size |= (long)get2(c) & 0xffff;
return 1;
}
STATIC int argcnt = ARGSTART - 1;
STATIC short arstate = NO_ARCHIVE;
FILE *next_file(argc,argv)
int argc;
char *argv[];
FILE* next_file(argc, argv) int argc;
char* argv[];
{
/* See if there are more EM input files. The file names
* are given via argv. If a file is an archive file
@ -237,61 +239,78 @@ FILE *next_file(argc,argv)
* occurrence, although we have seen a used occurrence.
*/
long ptr;
long ptr;
for (;;) {
for (;;)
{
/* This loop is only exited via a return */
if (arstate == ARCHIVE) {
if (arstate == ARCHIVE)
{
/* We were reading an archive file */
if (ftell(curfile) & 1) {
if (ftell(curfile) & 1)
{
/* modules in an archive file always
* begin on a word boundary, i.e. at
* an even address.
*/
fseek(curfile,1L,1);
fseek(curfile, 1L, 1);
}
if (read_hdr()) { /* read header of next module */
if (read_hdr())
{ /* read header of next module */
ptr = ftell(curfile); /* file position */
file_init(curfile,ARCHIVE,hdr.ar_size);
file_init(curfile, ARCHIVE, hdr.ar_size);
/* tell i/o package that we're reading
* an archive module of given length.
*/
if (useful()) {
if (useful())
{
/* re-initialize file, because 'useful'
* has read some bytes too.
*/
fseek(curfile,ptr,0); /* start module */
file_init(curfile,ARCHIVE,hdr.ar_size);
fseek(curfile, ptr, 0); /* start module */
file_init(curfile, ARCHIVE, hdr.ar_size);
return curfile;
} else {
}
else
{
/* skip this module */
fseek(curfile,
ptr+hdr.ar_size,0);
ptr + hdr.ar_size, 0);
}
} else {
}
else
{
/* done with this archive */
arstate = NO_ARCHIVE;
}
} else {
}
else
{
/* open next file, close old */
if (curfile != NULL) {
if (curfile != NULL)
{
fclose(curfile);
}
argcnt++;
if (argcnt >= argc) {
if (argcnt >= argc)
{
/* done with all arguments */
return NULL;
}
filename = argv[argcnt];
if ((curfile = fopen(filename,"r")) == NULL) {
error("cannot open %s",filename);
if ((curfile = fopen(filename, "r")) == NULL)
{
error("cannot open %s", filename);
}
if (is_archive(filename)) {
if (is_archive(filename))
{
/* ends on '.ma' */
arstate = ARCHIVE;
arch_init(curfile); /* read magic ar number */
} else {
file_init(curfile,NO_ARCHIVE,0L);
}
else
{
file_init(curfile, NO_ARCHIVE, 0L);
return curfile;
}
}