cast the tmalloc, MALLOC, return value

ChangeLog

@@ -1,3 +1,18 @@
+2010-10-24  Robert Larice
+ * src/frontend/com_sysinfo.c ,
+ * src/frontend/plotting/graf.c ,
+ * src/misc/util.c ,
+ * src/spicelib/devices/cpl/cplsetup.c ,
+ * src/spicelib/devices/soi3/soi3ask.c ,
+ * src/spicelib/devices/txl/txlsetup.c ,
+ * src/tclspice.c ,
+ * src/xspice/evt/evtinit.c ,
+ * src/xspice/evt/evtload.c ,
+ * src/xspice/icm/xtraevt/int/udnfunc.c ,
+ * src/xspice/icm/xtraevt/real/udnfunc.c ,
+ * src/xspice/idn/idndig.c :
+  cast the tmalloc, MALLOC, return value
+
 2010-10-24  Robert Larice
  * src/misc/wlist.c ,
  * src/spicelib/devices/bsim3/b3set.c ,

src/frontend/com_sysinfo.c

@@ -457,7 +457,7 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
     }
 
     RegQueryValueExA(hkBaseCPU,"ProcessorNameString",0,0,NULL,&dwLen);
-    freeStr = procStr = tmalloc(dwLen+1);
+    freeStr = procStr = (char*) tmalloc(dwLen+1);
     RegQueryValueExA(hkBaseCPU,"ProcessorNameString",0,0,(LPBYTE)procStr,&dwLen);
     procStr[dwLen] = '\0';
     while (*procStr == ' ') procStr++;

src/frontend/plotting/graf.c

@@ -136,7 +136,7 @@ gr_init(double *xlims, double *ylims, /* The size of the screen. */
 	pname = "(unknown)";
     if (!plotname)
 	plotname = "(unknown)";
-    comb_title = tmalloc(strlen(plotname) + strlen(pname) + 3);
+    comb_title = (char*) tmalloc(strlen(plotname) + strlen(pname) + 3);
     sprintf(comb_title, "%s: %s", pname, plotname);
     graph->plotname = comb_title;
 #endif

src/misc/util.c

@@ -171,7 +171,7 @@ basename(const char *name)
     len = strlen(name);
     if (name[len - 1] == '/') {
         // ditch the trailing '/'
-        p = tmp = tmalloc(len);
+        p = tmp = (char*) tmalloc(len);
         strncpy(p, name, len - 1); 
     } else {
         p = (char *) name;
@@ -221,7 +221,7 @@ dirname(const char *name)
 
     size = p - name;
     if (size) {
-        ret = tmalloc(size + 1);
+        ret = (char*) tmalloc(size + 1);
         memcpy(ret, name, size);
         ret[size] = '\0';
     } else if (*p == '/')
@@ -266,7 +266,7 @@ dirname(const char *name)
 
     size = p - name;
     if (size) {
-        ret = tmalloc(size + 1);
+        ret = (char*) tmalloc(size + 1);
         memcpy(ret, name, size);
         ret[size] = '\0';
     } else if (*p == '/')

src/spicelib/devices/cpl/cplsetup.c

@@ -1844,7 +1844,7 @@ insert_ND(char *name, NDnamePt *ndn)
    NDnamePt  p;
 
    if (*ndn == NULL) {
-      p = *ndn = (NDnamePt) tmalloc(sizeof (NDname));
+      p = *ndn = (NDname*) tmalloc(sizeof (NDname));
       p->nd = NULL;
       p->right = p->left = NULL;
       strcpy(p->id, name);
@@ -1963,7 +1963,7 @@ ordering(void)
             mv = ABS(ZY[i][j]);
             m = j;
          }
-      e = (MAXE_PTR) tmalloc(sizeof (MAXE));
+      e = (MAXE*) tmalloc(sizeof (MAXE));
       row = sort(row, mv, i, m, e);
    }
 }

src/spicelib/devices/soi3/soi3ask.c

@@ -496,7 +496,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 /*
         case SOI3_IS :
             if (ckt->CKTcurrentAnalysis & DOING_AC) {
-                errMsg = MALLOC(strlen(msg)+1);
+                errMsg = (char*) MALLOC(strlen(msg)+1);
                 errRtn = "SOI3ask.c";
                 strcpy(errMsg,msg);
                 return(E_ASKCURRENT);
@@ -514,7 +514,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
             return(OK);
         case SOI3_IB :
             if (ckt->CKTcurrentAnalysis & DOING_AC) {
-                errMsg = MALLOC(strlen(msg)+1);
+                errMsg = (char*) MALLOC(strlen(msg)+1);
                 errRtn = "SOI3ask.c";
                 strcpy(errMsg,msg);
                 return(E_ASKCURRENT);
@@ -525,7 +525,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
             return(OK);
         case SOI3_IGF :
             if (ckt->CKTcurrentAnalysis & DOING_AC) {
-                errMsg = MALLOC(strlen(msg)+1);
+                errMsg = (char*) MALLOC(strlen(msg)+1);
                 errRtn = "SOI3ask.c";
                 strcpy(errMsg,msg);
                 return(E_ASKCURRENT);
@@ -542,7 +542,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
             return(OK);
         case SOI3_IGB :
             if (ckt->CKTcurrentAnalysis & DOING_AC) {
-                errMsg = MALLOC(strlen(msg)+1);
+                errMsg = (char*) MALLOC(strlen(msg)+1);
                 errRtn = "SOI3ask.c";
                 strcpy(errMsg,msg);
                 return(E_ASKCURRENT);
@@ -559,7 +559,7 @@ SOI3ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
             return(OK);
         case SOI3_POWER :
             if (ckt->CKTcurrentAnalysis & DOING_AC) {
-                errMsg = MALLOC(strlen(msg)+1);
+                errMsg = (char*) MALLOC(strlen(msg)+1);
                 errRtn = "SOI3ask.c";
                 strcpy(errMsg,msg);
                 return(E_ASKPOWER);

src/spicelib/devices/txl/txlsetup.c

@@ -1027,7 +1027,7 @@ insert_ND(char *name, NDnamePt *ndn)
    NDnamePt  p;
 
    if (*ndn == NULL) {
-      p = *ndn = (NDnamePt) tmalloc(sizeof (NDname));
+      p = *ndn = (NDname*) tmalloc(sizeof (NDname));
       p->nd = NULL;
       p->right = p->left = NULL;
       strcpy(p->id, name);

src/tclspice.c

@@ -1482,7 +1482,7 @@ static void dvecToBlt(Blt_Vector *Data, struct dvec *x) {
     double *data;
     int i;
 
-    data = tmalloc(x->v_length * sizeof(double));
+    data = (double*) tmalloc(x->v_length * sizeof(double));
 
     for(i=0;i<x->v_length;i++) {
       data[i] = realpart(&x->v_compdata[i]);

src/xspice/evt/evtinit.c

@@ -106,7 +106,7 @@ int EVTinit(
     /* Will probably remove this restriction later... */
 /*
     if(ckt->evt->counts.num_hybrids == 0) {
-        errMsg = MALLOC(strlen(err_no_hybrids) + 1);
+        errMsg = (char*) MALLOC(strlen(err_no_hybrids) + 1);
         strcpy(errMsg, err_no_hybrids);
         return(E_PRIVATE);
     }

src/xspice/evt/evtload.c

@@ -346,7 +346,7 @@ static void EVTcreate_state(
 	{
 		
         new_state = (Evt_State_t *) MALLOC(sizeof(Evt_State_t));
-        new_state->block = (void *) MALLOC(total_size);
+        new_state->block = MALLOC(total_size);
 
     }
 

src/xspice/icm/xtraevt/int/udnfunc.c

@@ -53,7 +53,7 @@ void *tmalloc(size_t);
 static void udn_int_create(CREATE_ARGS)
 {
     /* Malloc space for an int */
-    MALLOCED_PTR = tmalloc(sizeof(int));
+    MALLOCED_PTR = (int*) tmalloc(sizeof(int));
 }
 
 

src/xspice/icm/xtraevt/real/udnfunc.c

@@ -53,7 +53,7 @@ void *tmalloc(size_t);
 static void udn_real_create(CREATE_ARGS)
 {
     /* Malloc space for a real struct */
-    MALLOCED_PTR = tmalloc(sizeof(double));
+    MALLOCED_PTR = (double*) tmalloc(sizeof(double));
 }
 
 

src/xspice/idn/idndig.c

@@ -51,7 +51,7 @@ static void idn_digital_create(void **evt_struct)
 {
     /* Malloc space for a digital struct */
 
-	*evt_struct = tmalloc(sizeof(Digital_t));
+	*evt_struct = (Digital_t*) tmalloc(sizeof(Digital_t));
 }