- Some compiler warnings

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12885 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 12, 2012 · c85e1ad · c85e1ad
1 parent 6aeac12
commit c85e1ad
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 54 deletions.
diff --git a/Compiler/runtime/System_rml.c b/Compiler/runtime/System_rml.c
@@ -180,14 +180,12 @@ RML_BEGIN_LABEL(System__removeFirstAndLastChar)
   char *str = RML_STRINGDATA(rmlA0);
   char *res = "";
   int length=strlen(str);
-  int i;
-  if(length > 1)
-    {
-      res=malloc(length-1);
-      strncpy(res,str + 1,length-2);
+  if(length > 1) {
+    res=malloc(length-1);
+    strncpy(res,str + 1,length-2);
 
-      res[length-1] = '\0';
-    }
+    res[length-1] = '\0';
+  }
 
   rmlA0 = (void*) mk_scon(res);
   /* adrpo added 2004-10-29 */
@@ -305,7 +303,7 @@ RML_BEGIN_LABEL(System__isIdenticalFile)
   char *fileName2 = RML_STRINGDATA(rmlA1);
   char emptyString[5] = "empty";
   int res=1,i;
-  FILE *fp1,*fp2,*d1,*d2;
+  FILE *fp1,*fp2,*d1;
   long fileSize1,fileSize2;
   fp1 = fopen(fileName1, "r");
 
@@ -1218,8 +1216,6 @@ int scandir(const char* dirname,
 
 void System_5finit(void)
 {
-  char* qthome;
-
   last_ptr_index = -1;
   memset(ptr_vector, 0, sizeof(ptr_vector));
 }
@@ -1297,9 +1293,8 @@ char *getSymbolicLinkPath(char* path)
  **/
 char* findSymbolicLinks(char* path)
 {
-    int readChars=0,pointer=0,i;
+    int i;
     char *curRes = (char *) malloc(sizeof(char)*MAXPATHLEN);
-    char *destPos;
     char *curPos;
     char *endPos;
     curRes[0]='\0';
@@ -1342,7 +1337,7 @@ char* normalizePath(const char* src)
 {
   const char* srcEnd = src + strlen(src);
   const char* srcPos = src;
-  char* dest;
+  char* dest = NULL;
   char* targetPos = dest;
   char* newSrcPos = NULL;
   char* p = NULL;
@@ -1545,22 +1540,24 @@ RML_BEGIN_LABEL(System__moFiles)
 }
 RML_END_LABEL
 
-char *path_cat (const char *str1, char *str2,char *fileString) {
-    size_t str1_len = strlen(str1),str2_len = strlen(str2);
-    struct stat buf;
-    char *result;
-    int ret_val;
+static char *path_cat (const char *str1, char *str2,char *fileString)
+{
+  struct stat buf;
+  char *result;
+  int ret_val;
 
-    result = (char *)malloc(PATH_MAX*sizeof( *result));
-    if(strcmp(str2,"..") ==0 || strcmp(str2,".")==0){ result[0]= '\0'; return result;}
-    sprintf(result,"%s%s/%s",str1,str2,fileString);
-    ret_val = stat(result, &buf);
+  result = (char *)malloc(PATH_MAX*sizeof( *result));
+  if(strcmp(str2,"..") ==0 || strcmp(str2,".")==0) {
+    result[0]= '\0'; return result;
+  }
+  sprintf(result,"%s%s/%s",str1,str2,fileString);
+  ret_val = stat(result, &buf);
 
-    if (ret_val == 0 && buf.st_mode & S_IFREG) {
-            return result;
-    }
-    result[0]='\0';
+  if (ret_val == 0 && buf.st_mode & S_IFREG) {
     return result;
+  }
+  result[0]='\0';
+  return result;
 }
 
 RML_BEGIN_LABEL(System__getPackageFileNames)

diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -567,7 +567,7 @@ int SystemImpl__systemCall(const char* str)
 
 int SystemImpl__spawnCall(const char* path, const char* str)
 {
-  int status = -1,ret_val = -1;
+  int ret_val = -1;
   const int debug = 0;
   if (debug) {
     fprintf(stderr, "System.spawnCall: %s\n", str); fflush(NULL);
@@ -657,7 +657,7 @@ extern int SystemImpl__directoryExists(const char *str)
 char* SystemImpl__readFileNoNumeric(const char* filename)
 {
   char* buf, *bufRes;
-  int res,bufPointer = 0,numCount;
+  int res,numCount;
   FILE * file = NULL;
   struct stat statstr;
   res = stat(filename, &statstr);
@@ -692,7 +692,6 @@ char* SystemImpl__readFileNoNumeric(const char* filename)
 double SystemImpl__getCurrentTime()
 {
   time_t t;
-  double elapsedTime;             // the time elapsed as double
   time( &t );
   return difftime(t, 0); // the current time
 }
@@ -707,9 +706,7 @@ typedef const struct dirent* direntry;
 
 static int file_select_mo(direntry entry)
 {
-  char fileName[MAXPATHLEN];
-  int res; char* ptr;
-  struct stat fileStatus;
+  char* ptr;
   if ((strcmp(entry->d_name, ".") == 0) ||
       (strcmp(entry->d_name, "..") == 0) ||
       (strcmp(entry->d_name, "package.mo") == 0)) {
@@ -1455,22 +1452,6 @@ int SystemImpl__lpsolve55(void *lA, void *lB, void *ix, void **res)
   return info;
 }
 
-static int getPrio(const char *ver, size_t versionLen)
-{
-  if (!ver) return 0;
-  int status = 0;
-  while (*ver && versionLen) {
-    if (*ver >= '0' && *ver <= '9') status = 1;
-    else if (status == 1 && *ver == '.') status = 2;
-    else if (status == 1 && *ver == ' ') return 2;
-    else return 3;
-    ver++;
-    versionLen--;
-  }
-  /* TODO: Handle pre-release, release, non-release */
-  return 1;
-}
-
 typedef struct {
   const char *dir;
   char *file;
@@ -1493,7 +1474,7 @@ void splitVersion(const char *version, long *versionNum, char **versionExtra)
     if (cont) {
       *versionNum = *versionNum + (l << (i*8));
       /* fprintf(stderr, "versionNum %lx\n", *versionNum); */
-      if (*next == '.') *next++;
+      if (*next == '.') next++;
     }
     buf = next;
   } while (cont && i-- > 0);
@@ -1557,7 +1538,6 @@ static modelicaPathEntry* getAllModelicaPaths(const char *name, size_t nlen, voi
     const char *mp = RML_STRINGDATA(RML_CAR(mps));
     DIR *dir = opendir(mp);
     struct dirent *ent;
-    int len;
     mps = RML_CDR(mps);
     if (!dir) continue;
     while ((ent = readdir(dir))) {
@@ -1612,7 +1592,7 @@ static int getLoadModelPathFromSingleTarget(const char *searchTarget, modelicaPa
 {
   int i, foundIndex = -1;
   long version, foundVersion = 0;
-  char *versionExtra, *foundVersionExtra;
+  char *versionExtra;
   splitVersion(searchTarget,&version,&versionExtra);
   /* fprintf(stderr, "expected %lx %s\n", version, versionExtra); */
   if (version > 0 && !*versionExtra) {
@@ -1670,7 +1650,7 @@ static int getLoadModelPathFromDefaultTarget(const char *name, modelicaPathEntry
 {
   const char *foundExtra = 0;
   long foundVersion = -1;
-  int bestPrio,i,foundIndex;
+  int i,foundIndex;
 
   /* Force preferred version MSL 3.1 */
   if (0 == strcmp("Modelica",name)) {
@@ -1717,6 +1697,7 @@ static int getLoadModelPathFromDefaultTarget(const char *name, modelicaPathEntry
     *isDir = entries[foundIndex].fileIsDir;
     return 0;
   }
+  return 1;
 }
 
 int SystemImpl__getLoadModelPath(const char *name, void *prios, void *mps, const char **outDir, char **outName, int *isDir)
@@ -1850,7 +1831,6 @@ extern char* SystemImpl__iconv(const char * str, const char *from, const char *t
   }
   buf[(buflen-1)-out_sz] = 0;
   if (strlen(buf) != (buflen-1)-out_sz) {
-    const char *tokens[1] = {to};
     if (printError) c_add_message(-1,ErrorType_scripting,ErrorLevel_error,gettext("iconv(to=%s) failed because the character set output null bytes in the middle of the string."),&to,1);
     return (char*) "";
   }
@@ -1943,7 +1923,6 @@ void SystemImpl__gettextInit(const char *locale)
     (setlocale(LC_MESSAGES, locale2) && setlocale(LC_CTYPE, locale2)) ||
     setlocale(LC_MESSAGES, locale) && setlocale(LC_CTYPE, locale);
   if (!res) {
-    const char *c_tokens[1]={locale};
     fprintf(stderr, gettext("Warning: Failed to set locale: '%s'\n"), locale);
   }
   free(locale2);