fixed error in extract.c

csound · Dec 20, 2013 · 724e88b · 724e88b
1 parent 5a5a125
commit 724e88b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/Engine/csound_orc_compile.c b/Engine/csound_orc_compile.c
@@ -1598,7 +1598,7 @@ PUBLIC int csoundCompileTree(CSOUND *csound, TREE *root)
       /* run global i-time code */
       init0(csound);
       csound->ids = ids;
-      
+
     }
     else {
       /* first compilation */
@@ -1900,12 +1900,13 @@ static ARG* createArg(CSOUND *csound, INSTRTXT* ip,
       arg->index = n;
     }
     /* trap local ksmps and kr  */
-    else if ( (strcmp(s, "ksmps") == 0 && csoundFindVariableWithName(ip->varPool, s))
-             || (strcmp(s, "kr") == 0 && csoundFindVariableWithName(ip->varPool, s))){
-      arg->type = ARG_LOCAL;
-      arg->argPtr = csoundFindVariableWithName(ip->varPool, s);
-      CS_VARIABLE *var = (CS_VARIABLE *)arg->argPtr;
-    }
+    else
+      if ((strcmp(s, "ksmps") == 0 && csoundFindVariableWithName(ip->varPool, s))
+          || (strcmp(s, "kr") == 0 && csoundFindVariableWithName(ip->varPool, s))) {
+        arg->type = ARG_LOCAL;
+        arg->argPtr = csoundFindVariableWithName(ip->varPool, s);
+        CS_VARIABLE *var = (CS_VARIABLE *)arg->argPtr;
+      }
     else if (c == 'g' || (c == '#' && *(s+1) == 'g') ||
              csoundFindVariableWithName(csound->engineState.varPool, s) != NULL) {
       // FIXME - figure out why string pool searched with gexist

diff --git a/Engine/extract.c b/Engine/extract.c
@@ -70,7 +70,8 @@ void readxfil(CSOUND *csound, EXTRACT_STATICS* extractStatics,
     flag = 'i';                                 /* default -i flag supplied */
     STA(onsect) = 1;     STA(onbeat) = FL(0.0);   /* other default vals   */
     STA(offsect) = 999;  STA(offbeat) = FL(0.0);
-    while (fscanf(xfp, s) != EOF) {
+    //    while (fscanf(xfp, s) != EOF) {
+    while (fgets(s, 82, xfp) != NULL) {
       char *c = s;
       int i;
       switch (*c) {

diff --git a/Engine/insert.c b/Engine/insert.c
@@ -1398,7 +1398,7 @@ int xoutset(CSOUND *csound, XOUT *p)
     tmp = buf->iobufp_ptrs;
     if (*tmp || *(tmp + 1) || *(tmp + 2) || *(tmp + 3))
       tmp += (inm->perf_incnt << 1);
-    tmp += 4; 
+    tmp += 4;
     if (*tmp || *(tmp + 1))
       return OK;
 
@@ -2354,7 +2354,7 @@ void *init_pass_thread(void *p){
     int done;
     float wakeup = (1000*csound->ksmps/csound->esr);
     while(csound->init_pass_loop) {
-        
+
 #if defined(MACOSX) || defined(LINUX) || defined(HAIKU)
       usleep(1000*wakeup);
 #else
@@ -2392,9 +2392,9 @@ void *init_pass_thread(void *p){
           csoundUnlockMutex(csound->init_pass_threadlock);
         }
         ip = nxt;
-        
+
       }
-      
+
     }
     return NULL;
 }
diff --git a/Engine/symbtab.c b/Engine/symbtab.c
@@ -112,7 +112,7 @@ ORCTOKEN *add_token(CSOUND *csound, char *s, int type)
     if (a!=NULL) {
       if (type == a->type) return a;
       if ((type!=T_FUNCTION || a->type!=T_OPCODE))
-	csound->Warning(csound,
+        csound->Warning(csound,
                         Str("Type confusion for %s (%d,%d), replacing\n"),
                         s, type, a->type);
       a->type = type;

diff --git a/Opcodes/sfont.c b/Opcodes/sfont.c
@@ -92,8 +92,8 @@ int sfont_ModuleDestroy(CSOUND *csound)
     }
     free(sfArray);
     globals->currSFndx = 0;
-    csound->Free(csound, globals->presetp); 
-    csound->Free(csound, globals->sampleBase); 
+    csound->Free(csound, globals->presetp);
+    csound->Free(csound, globals->sampleBase);
 
     csound->DestroyGlobalVariable(csound, "::sfontg");
     return 0;
@@ -2601,12 +2601,14 @@ int sfont_ModuleCreate(CSOUND *csound)
                                Str("error... could not create sfont globals\n"));
 
     globals->sfArray = (SFBANK *) malloc(MAX_SFONT*sizeof(SFBANK));
-    globals->presetp = (presetType **) csound->Malloc(csound, MAX_SFPRESET *sizeof(presetType *));
-    globals->sampleBase = (SHORT **) csound->Malloc(csound, MAX_SFPRESET*sizeof(SHORT *));
+    globals->presetp =
+      (presetType **) csound->Malloc(csound, MAX_SFPRESET *sizeof(presetType *));
+    globals->sampleBase =
+      (SHORT **) csound->Malloc(csound, MAX_SFPRESET*sizeof(SHORT *));
     globals->currSFndx = 0;
     globals->maxSFndx = MAX_SFONT;
     for (j=0; j<128; j++) {
-      globals->pitches[j] = (MYFLT) (440.0 * pow (2.0,(j - 69.0)/12.0));
+      globals->pitches[j] = (MYFLT) (440.0 * pow(2.0, (double)(j- 69)/12.0));
     }
 
    return OK;

diff --git a/mingw64-linux/README.md b/mingw64-linux/README.md
@@ -13,7 +13,7 @@ of Csound from Linux.  These scripts were developed using Debian.
 2. Create a directory called mingw64 in your home directory. This is where the 
 dependencies will be built and installed to::
 
-    mdkir ~/mingw64
+    mkdir ~/mingw64
 
 3. Run the download-deps.sh script.  This script will download source and
 binary versions of dependencies that Csound will need. A folder called cache