Merge pull request #852 from uyjulian/new_cstd_host_fixes

Host tool fixes for new compiler

Author: fjtrujy

tools/adpenc/src/adpcm.c

@@ -204,8 +204,8 @@ static void find_predict( short *samples, double *d_samples, int *predict_nr, in
             if ( fabs( ds ) > max[i] )
                 max[i] = fabs( ds );
 //                printf( "%+5.2f\n", s2 );
-                s_2 = s_1;                                  // new s[t-2]
-                s_1 = s_0;                                  // new s[t-1]
+            s_2 = s_1;                                  // new s[t-2]
+            s_1 = s_0;                                  // new s[t-1]
         }
 
         if ( max[i] < min ) {

tools/romimg/src/romimg.c

@@ -467,9 +467,9 @@ int AddFile(ROMIMG *ROMImg, const char *path, int upperconv)
             tbuf[sizeof(tbuf) - 1] = '\0';
             if (tbuf[0] != '\0') {
                 upperbuff(tbuf);
-                fname = tbuf;
-                char* T = strrchr(fname, '.');
+                char* T = strrchr(tbuf, '.');
                 if (T != NULL) *T = '\0'; //null terminate extension
+                fname = tbuf;
             }
         }
 		int size;