Merge branch 'master' into magic-8.2

ext2spice/ext2hier.c

@@ -1159,13 +1159,11 @@ spcresistHierVisit(hc, hierName1, hierName2, res)
     HierContext *hc;
     HierName *hierName1;
     HierName *hierName2;
-    int res;
+    float res;
 {
-    res = (res + 500) / 1000;
- 
-    fprintf(esSpiceF, "R%d %s %s %d\n", esResNum++,
+    fprintf(esSpiceF, "R%d %s %s %g\n", esResNum++,
 		nodeSpiceHierName(hc, hierName1),
-                nodeSpiceHierName(hc, hierName2), res);
+                nodeSpiceHierName(hc, hierName2), res / 1000.);
 
     return 0;
 }

extflat/EFread.c

@@ -581,8 +581,12 @@ resistChanged:
 		break;
 
 	    /* resistor node1 node2 resistance */
+	    /* NOTE:  Value changed to floating-point 12/16/2019;     */
+	    /* (value * rscale) is in milliohms which is integer as   */
+	    /* resolution finer than milliohms is deemed unnecessary. */
 	    case RESISTOR:
-		efBuildResistor(def, argv[1], argv[2], rscale*atoi(argv[3]));
+		efBuildResistor(def, argv[1], argv[2],
+			    (int)(0.5 + (double)rscale * atof(argv[3])));
 		break;
 
 	    /* abstract (no options/arguments) */

lef/lefWrite.c

@@ -84,6 +84,7 @@ lefFileOpen(def, file, suffix, mode, prealfile)
 {
     char namebuf[512], *name, *endp, *ends;
     char *locsuffix;
+    char *pptr;
     int len;
     FILE *rfile;
 
@@ -109,7 +110,7 @@ lefFileOpen(def, file, suffix, mode, prealfile)
 
     if (endp = strrchr(ends, '.'))
     {
-	if (!strcmp(endp, suffix))
+	if (strcmp(endp, suffix))
 	{
 	    len = endp - name;
 	    if (len > sizeof namebuf - 1) len = sizeof namebuf - 1;

resis/ResPrint.c

@@ -85,10 +85,10 @@ ResPrintExtRes(outextfile,resistors,nodename)
 	  }
 	  if (ResOptionsFlags & ResOpt_DoExtFile)
 	  {
-     	       fprintf(outextfile, "resist \"%s\" \"%s\" %d\n",
+     	       fprintf(outextfile, "resist \"%s\" \"%s\" %g\n",
 		    resistors->rr_connection1->rn_name,
 		    resistors->rr_connection2->rn_name,
-		    (int) (resistors->rr_value/ExtCurStyle->exts_resistScale));
+		    resistors->rr_value / (float)ExtCurStyle->exts_resistScale);
 	  }
      }
 }