Skip to content

Commit

Permalink
tabs/spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
jpffitch committed Dec 13, 2017
1 parent 1989080 commit 3c950d7
Show file tree
Hide file tree
Showing 5 changed files with 1,754 additions and 1,755 deletions.
29 changes: 14 additions & 15 deletions OOps/aops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1382,11 +1382,10 @@ int in(CSOUND *csound, INM *p)
{
uint32_t offset = p->h.insdshead->ksmps_offset*sizeof(MYFLT);
uint32_t early = p->h.insdshead->ksmps_no_end;
if(csound->inchnls != 1)
if (csound->inchnls != 1)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");

p->h.insdshead,
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
if (UNLIKELY(offset)) memset(p->ar, '\0', offset);
memcpy(&p->ar[offset], CS_SPIN, (CS_KSMPS-early) * sizeof(MYFLT)-offset);
Expand Down Expand Up @@ -1432,7 +1431,7 @@ int ins(CSOUND *csound, INS *p)
uint32_t n, nsmps =CS_KSMPS, k;
if(csound->inchnls != 2)
return csound->PerfError(csound, p->h.insdshead,
"Wrong numnber of input channels\n");
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
sp = CS_SPIN;
ar1 = p->ar1;
Expand Down Expand Up @@ -1463,8 +1462,8 @@ int inq(CSOUND *csound, INQ *p)
uint32_t n, nsmps =CS_KSMPS, k;
if(csound->inchnls != 4)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");
p->h.insdshead,
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
if (UNLIKELY(offset)) {
memset(ar1, '\0', offset*sizeof(MYFLT));
Expand Down Expand Up @@ -1498,8 +1497,8 @@ int inh(CSOUND *csound, INH *p)
uint32_t n, nsmps =CS_KSMPS, k;
if(csound->inchnls != 6)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");
p->h.insdshead,
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
if (UNLIKELY(offset)) {
memset(ar1, '\0', offset*sizeof(MYFLT));
Expand Down Expand Up @@ -1540,8 +1539,8 @@ int ino(CSOUND *csound, INO *p)
uint32_t n, nsmps =CS_KSMPS, k;
if(csound->inchnls != 8)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");
p->h.insdshead,
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
if (UNLIKELY(offset)) {
memset(ar1, '\0', offset*sizeof(MYFLT));
Expand Down Expand Up @@ -1586,8 +1585,8 @@ static int inn(CSOUND *csound, INALL *p, uint32_t n)
uint32_t m, nsmps =CS_KSMPS, i;
if(csound->inchnls != n)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");
p->h.insdshead,
"Wrong numnber of input channels\n");

CSOUND_SPIN_SPINLOCK
if (UNLIKELY(offset)) for (i = 0; i < n; i++)
Expand Down Expand Up @@ -1715,8 +1714,8 @@ int inall_opcode(CSOUND *csound, INALL *p)
MYFLT *spin = CS_SPIN;
if(csound->inchnls != n)
return csound->PerfError(csound,
p->h.insdshead,
"Wrong numnber of input channels\n");
p->h.insdshead,
"Wrong numnber of input channels\n");
CSOUND_SPIN_SPINLOCK
m = (n < (uint32_t)csound->inchnls ? n : (uint32_t)csound->inchnls);
for (j=0; j<nsmps; j++)
Expand Down
4 changes: 2 additions & 2 deletions OOps/ugrw1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ int printsset(CSOUND *csound, PRINTS *p)
memset(string,0,8192);
if (sprints(string, pk.txtstring, p->kvals, p->INOCOUNT-1)==NOTOK)
return
csound->PerfError(csound, p->h.insdshead,
csound->InitError(csound,
Str("Insufficient arguments in formatted printing"));
csound->MessageS(csound, CSOUNDMSG_ORCH, "%s", string);
return OK;
Expand All @@ -1216,7 +1216,7 @@ int printsset_S(CSOUND *csound, PRINTS *p)
memset(string,0,8192);
if (sprints(string, pk.txtstring, p->kvals, p->INOCOUNT-1)==NOTOK)
return
csound->PerfError(csound, p->h.insdshead,
csound->InitError(csound,
Str("Insufficient arguments in formatted printing"));
csound->MessageS(csound, CSOUNDMSG_ORCH, "%s", string);
} else {
Expand Down

0 comments on commit 3c950d7

Please sign in to comment.