View | Details | Raw Unified | Return to bug 171972 | Differences between
and this patch

Collapse All | Expand All

(-)cad/magic/Makefile (-7 / +3 lines)
Lines 1-12 Link Here
1
# New ports collection makefile for:    magic
1
# Created by: swallace
2
# Date created:         18 Dec 1994
3
# Whom:                 swallace
4
#
5
# $FreeBSD: ports/cad/magic/Makefile,v 1.40 2012/05/21 03:10:12 miwi Exp $
2
# $FreeBSD: ports/cad/magic/Makefile,v 1.40 2012/05/21 03:10:12 miwi Exp $
6
#
7
3
8
PORTNAME=	magic
4
PORTNAME=	magic
9
PORTVERSION=	7.5.220
5
PORTVERSION=	7.5.221
10
CATEGORIES=	cad
6
CATEGORIES=	cad
11
MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
7
MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
12
		http://fossies.org/linux/misc/
8
		http://fossies.org/linux/misc/
Lines 17-23 Link Here
17
13
18
LICENSE=	BSD
14
LICENSE=	BSD
19
15
20
LIB_DEPENDS=	BLT24.3:${PORTSDIR}/x11-toolkits/blt
16
LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt
21
17
22
CONFIGURE_WRKSRC=	${WRKSRC}/scripts
18
CONFIGURE_WRKSRC=	${WRKSRC}/scripts
23
19
(-)cad/magic/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (magic-7.5.220.tgz) = a6a9c2bcd3e16942165a40cdcda28937f2cc122a47d92812f47e46dd67d0f69e
1
SHA256 (magic-7.5.221.tgz) = 7f028ba6e2ed35861d4b3256c5b0f87491901283769257432943be4372fcb42b
2
SIZE (magic-7.5.220.tgz) = 3746889
2
SIZE (magic-7.5.221.tgz) = 3746873
(-)cad/magic/files/patch-calma__CalmaRdcl.c (+99 lines)
Line 0 Link Here
1
--- calma/CalmaRdcl.c.orig	2010-06-25 22:59:51.000000000 +0900
2
+++ calma/CalmaRdcl.c	2012-09-13 00:54:14.000000000 +0900
3
@@ -540,7 +540,7 @@
4
     calmaSkipSet(calmaElementIgnore);
5
 
6
     /* Read subcell name */
7
-    if (!calmaReadStringRecord(CALMA_SNAME, &sname)) return;
8
+    if (!calmaReadStringRecord(CALMA_SNAME, &sname)) return 0;
9
 
10
     /*
11
      * Create a new cell use with this transform.  If the
12
@@ -618,20 +618,20 @@
13
 			def->cd_name, cifReadCellDef->cd_name);
14
 	calmaReadError(" and can't be used as a subcell.\n");
15
 	calmaReadError("(Use skipped)\n");
16
-	return;
17
+	return 0;
18
     }
19
 
20
     /* Read subcell transform */
21
     if (!calmaReadTransform(&trans, sname))
22
     {
23
 	printf("Couldn't read transform.\n");
24
-	return;
25
+	return 0;
26
     }
27
 
28
     /* Get number of columns and rows if array */
29
     cols = rows = 0;  /* For half-smart compilers that complain otherwise. */
30
     READRH(nbytes, rtype);
31
-    if (nbytes < 0) return;
32
+    if (nbytes < 0) return 0;
33
     if (rtype == CALMA_COLROW)
34
     {
35
 	isArray = TRUE;
36
@@ -639,7 +639,7 @@
37
 	READI2(rows);
38
 	xlo = 0; xhi = cols - 1;
39
 	ylo = 0; yhi = rows - 1;
40
-	if (feof(calmaInputFile)) return;
41
+	if (feof(calmaInputFile)) return 0;
42
 	(void) calmaSkipBytes(nbytes - CALMAHEADERLENGTH - 4);
43
     }
44
     else
45
@@ -653,11 +653,11 @@
46
      * For arrays, there will be three; for their meanings, see below.
47
      */
48
     READRH(nbytes, rtype)
49
-    if (nbytes < 0) return;
50
+    if (nbytes < 0) return 0;
51
     if (rtype != CALMA_XY)
52
     {
53
 	calmaUnexpected(CALMA_XY, rtype);
54
-	return;
55
+	return 0;
56
     }
57
 
58
     /* Length of remainder of record */
59
@@ -695,7 +695,7 @@
60
 	{
61
 	    calmaReadPoint(&refarray[n], 1);
62
 	    if (feof(calmaInputFile))
63
-		return;
64
+		return 0;
65
 	}
66
     }
67
     else
68
@@ -726,7 +726,7 @@
69
 	    }
70
 
71
 	    if (feof(calmaInputFile))
72
-		return;
73
+		return 0;
74
 	}
75
     }
76
 
77
@@ -787,19 +787,19 @@
78
     while (1)
79
     {
80
 	READRH(nbytes, rtype);
81
-	if (nbytes < 0) return;
82
+	if (nbytes < 0) return 0;
83
 	if (rtype == CALMA_PROPATTR)
84
 	{
85
 	    READI2(propAttrType);
86
 	    if (propAttrType == CALMA_PROP_USENAME)
87
 	    {
88
 		if (!calmaReadStringRecord(CALMA_PROPVALUE, &useid))
89
-		    return;
90
+		    return 0;
91
 	    }
92
 	    else if (propAttrType == CALMA_PROP_ARRAY_LIMITS)
93
 	    {
94
 		if (!calmaReadStringRecord(CALMA_PROPVALUE, &arraystr))
95
-		    return;
96
+		    return 0;
97
 		else if (arraystr)
98
 		{
99
 		    int xl, xh, yl, yh;
(-)cad/magic/files/patch-calma__CalmaRead.c (+11 lines)
Line 0 Link Here
1
--- calma/CalmaRead.c.orig	2008-01-16 02:08:40.000000000 +0900
2
+++ calma/CalmaRead.c	2012-09-13 00:51:41.000000000 +0900
3
@@ -442,7 +442,7 @@
4
     char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9, *a10;
5
 {
6
     calmaTotalErrors++;
7
-    if (CIFWarningLevel == CIF_WARN_NONE) return;
8
+    if (CIFWarningLevel == CIF_WARN_NONE) return 0;
9
 
10
     if ((calmaTotalErrors < 100) || (CIFWarningLevel != CIF_WARN_LIMIT))
11
     {
(-)cad/magic/files/patch-cif__CIFrdtech.c (+11 lines)
Line 0 Link Here
1
--- cif/CIFrdtech.c.orig	2010-09-16 00:45:09.000000000 +0900
2
+++ cif/CIFrdtech.c	2012-09-13 00:58:26.000000000 +0900
3
@@ -1218,7 +1218,7 @@
4
 
5
     lgcf = FindGCF(istyle->crs_scaleFactor, istyle->crs_multiplier);
6
     if (lgcf < lmult) lmult = lgcf;
7
-    if (lmult == 0) return;
8
+    if (lmult == 0) return 0;
9
 
10
     /* fprintf(stderr, "Multiplier goes from %d to %d\n", istyle->crs_multiplier,
11
 		istyle->crs_multiplier / lmult); */
(-)cad/magic/files/patch-ext2sim__ext2sim.c (+20 lines)
Line 0 Link Here
1
--- ext2sim/ext2sim.c.orig	2012-04-20 23:12:44.000000000 +0900
2
+++ ext2sim/ext2sim.c	2012-09-13 00:45:15.000000000 +0900
3
@@ -1209,7 +1209,7 @@
4
     	if (he == NULL)
5
     	{
6
 		fprintf(outf, "errGnd!");
7
-		return;
8
+		return 0;
9
     	}
10
     	/* Canonical name */
11
     	nn = (EFNodeName *) HashGetValue(he);
12
@@ -1338,7 +1338,7 @@
13
     if (he == NULL)
14
     {
15
 	fprintf(outf, " GND");
16
-	return;
17
+	return 0;
18
     }
19
 
20
     /* Canonical name */
(-)cad/magic/files/patch-ext2spice__ext2spice.c (+29 lines)
Line 0 Link Here
1
--- ext2spice/ext2spice.c.orig	2012-04-30 21:17:37.000000000 +0900
2
+++ ext2spice/ext2spice.c	2012-09-13 00:48:02.000000000 +0900
3
@@ -2119,7 +2119,7 @@
4
 	if ((node == NULL) || (node->efnode_client == (ClientData)NULL))
5
 	{
6
 	    TxError("spcnAP: major internal inconsistency\n");
7
-	    return;
8
+	    return 0;
9
 	}
10
 
11
 	if ( esScale < 0 )
12
@@ -2138,7 +2138,7 @@
13
 	    ((float)node->efnode_pa[resClass].pa_area*scale*scale)
14
 	    *esScale*esScale*dsc,
15
 	    ((float)node->efnode_pa[resClass].pa_perim*scale)*esScale*dsc);
16
-	return;
17
+	return 0;
18
 
19
 oldFmt:
20
 	if ( resClass == NO_RESCLASS ||
21
@@ -2226,7 +2226,7 @@
22
     if (he == NULL)
23
     {
24
 	fprintf(outf, " errGnd!");
25
-	return;
26
+	return 0;
27
     }
28
     nn = (EFNodeName *) HashGetValue(he);
29
     fprintf(outf, " %s", nodeSpiceName(nn->efnn_node->efnode_name->efnn_hier));
(-)cad/magic/files/patch-extflat__EFvisit.c (+11 lines)
Line 0 Link Here
1
--- extflat/EFvisit.c.orig	2009-07-01 22:38:11.000000000 +0900
2
+++ extflat/EFvisit.c	2012-09-12 23:54:40.000000000 +0900
3
@@ -576,7 +576,7 @@
4
 	return 0;
5
 
6
     if ((he = EFHNLook(hc->hc_hierName, name2, "resist(2)")) == NULL)
7
-	return;
8
+	return 0;
9
     n2 = ((EFNodeName *) HashGetValue(he))->efnn_node;
10
     if (n2->efnode_flags & EF_KILLED)
11
 	return 0;
(-)cad/magic/files/patch-grouter__grouteChan.c (+20 lines)
Line 0 Link Here
1
--- grouter/grouteChan.c.orig	2007-04-21 02:57:00.000000000 +0900
2
+++ grouter/grouteChan.c	2012-09-13 01:04:14.000000000 +0900
3
@@ -446,7 +446,7 @@
4
     WindUpdate();
5
     (void) sprintf(m, "%s: --more-- (t for tiles): ", mesg);
6
     if (TxGetLinePrompt(answer, sizeof answer, m) == NULL || answer[0] != 't')
7
-	return;
8
+	return 0;
9
 
10
     (void) DBSrPaintArea((Tile *) NULL, glChanPlane, &TiPlaneRect,
11
 	    &DBAllTypeBits, glChanShowFunc, (ClientData) NULL);
12
@@ -467,7 +467,7 @@
13
     TxMore(mesg);
14
     ShowRect(EditCellUse->cu_def, &r, STYLE_ERASEHIGHLIGHTS);
15
     if (tile->ti_client == (ClientData) CLIENTDEFAULT)
16
-	return;
17
+	return 0;
18
     ch = (GCRChannel *) tile->ti_client;
19
     ShowRect(EditCellUse->cu_def, &ch->gcr_area, STYLE_MEDIUMHIGHLIGHTS);
20
     (void) sprintf(mesg, "chan %x type=%d", ch, ch->gcr_type);
(-)cad/magic/files/patch-grouter__grouteDens.c (+11 lines)
Line 0 Link Here
1
--- grouter/grouteDens.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ grouter/grouteDens.c	2012-09-13 01:06:43.000000000 +0900
3
@@ -78,7 +78,7 @@
4
     ASSERT(srcPin->gcr_ch == dstPin->gcr_ch, "glDensAdjust");
5
 
6
     if (DebugIsSet(glDebugID, glDebGreedy))
7
-	return;
8
+	return 0;
9
 
10
     /*
11
      * Find the first and last column where this net (netId)
(-)cad/magic/files/patch-lef__defRead.c (+11 lines)
Line 0 Link Here
1
--- lef/defRead.c.orig	2008-05-11 05:13:05.000000000 +0900
2
+++ lef/defRead.c	2012-09-13 01:01:24.000000000 +0900
3
@@ -599,7 +599,7 @@
4
     if (keyword < 0)
5
     {
6
 	LefError("Unknown macro orientation \"%s\".\n", token);
7
-	return;
8
+	return 0;
9
     }
10
 
11
     /* The standard transformations are all defined to rotate	*/
(-)cad/magic/files/patch-mzrouter__mzDebug.c (+11 lines)
Line 0 Link Here
1
--- mzrouter/mzDebug.c.orig	2007-04-21 02:57:00.000000000 +0900
2
+++ mzrouter/mzDebug.c	2012-09-13 01:09:14.000000000 +0900
3
@@ -457,7 +457,7 @@
4
 
5
 	TxPrintf("}\n");
6
     }
7
-    return;
8
+    return 0;
9
 }
10
 
11
 /*
(-)cad/magic/files/patch-netmenu__NMmain.c (+29 lines)
Line 0 Link Here
1
--- netmenu/NMmain.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMmain.c	2012-09-12 23:59:37.000000000 +0900
3
@@ -256,7 +256,7 @@
4
      * can be called before the window exists).
5
      */
6
     
7
-    if (NMWindow == (MagWindow *) NULL) return;
8
+    if (NMWindow == (MagWindow *) NULL) return 0;
9
 
10
     GrLock(w, TRUE);
11
 
12
@@ -372,7 +372,7 @@
13
 	goto done;
14
     }
15
 
16
-    if (w == NULL) return;
17
+    if (w == NULL) return 0;
18
 
19
     WindPointToSurface(w, &cmd->tx_p, &surfacePoint, (Rect *) NULL);
20
 
21
@@ -432,7 +432,7 @@
22
 
23
     done:
24
     UndoNext();
25
-    return;
26
+    return 0;
27
 }
28
 	    
29
 
(-)cad/magic/files/patch-netmenu__NMnetlist.c (+139 lines)
Line 0 Link Here
1
--- netmenu/NMnetlist.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMnetlist.c	2012-09-13 00:05:02.000000000 +0900
3
@@ -223,12 +223,12 @@
4
     HashEntry *h;
5
     NetEntry *entry;
6
 
7
-    if ((name == 0) || (nmCurrentNetlist == NULL)) return;
8
+    if ((name == 0) || (nmCurrentNetlist == NULL)) return 0;
9
 
10
     h = HashLookOnly(&nmCurrentNetlist->nl_table, name);
11
-    if (h == NULL) return;
12
+    if (h == NULL) return 0;
13
     entry = (NetEntry *) HashGetValue(h);
14
-    if (entry == 0) return;
15
+    if (entry == 0) return 0;
16
     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
17
     HashSetValue(h, 0);
18
     NMUndo(entry->ne_name, entry->ne_next->ne_name, NMUE_REMOVE);
19
@@ -264,8 +264,8 @@
20
     HashEntry *ha, *hb;
21
     NetEntry *netA, *netB, *tmp;
22
 
23
-    if ((termA == NULL) || (termB == NULL)) return;
24
-    if (nmCurrentNetlist == NULL) return;
25
+    if ((termA == NULL) || (termB == NULL)) return 0;
26
+    if (nmCurrentNetlist == NULL) return 0;
27
 
28
     /* Lookup the two nets, and make sure that they both exist
29
      * and aren't already the same.
30
@@ -275,12 +275,12 @@
31
     netA = (NetEntry *) HashGetValue(ha);
32
     hb = HashFind(&nmCurrentNetlist->nl_table, termB);
33
     netB = (NetEntry *) HashGetValue(hb);
34
-    if ((netA == 0) || (netB == 0)) return;
35
+    if ((netA == 0) || (netB == 0)) return 0;
36
     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
37
     tmp = netA;
38
     while (TRUE)
39
     {
40
-	if (tmp == netB) return;
41
+	if (tmp == netB) return 0;
42
 	tmp = tmp->ne_next;
43
 	if (tmp == netA) break;
44
     }
45
@@ -336,11 +336,11 @@
46
     HashEntry *h;
47
     NetEntry *ne, *next;
48
 
49
-    if ((net == NULL) || (nmCurrentNetlist == NULL)) return;
50
+    if ((net == NULL) || (nmCurrentNetlist == NULL)) return 0;
51
     h = HashLookOnly(&nmCurrentNetlist->nl_table, net);
52
-    if (h == NULL) return;
53
+    if (h == NULL) return 0;
54
     ne = (NetEntry *) HashGetValue(h);
55
-    if (ne == 0) return;
56
+    if (ne == 0) return 0;
57
     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
58
 
59
     /* The order of processing is a bit tricky.  Since we use net for
60
@@ -402,7 +402,7 @@
61
     if ((name == NULL) || (name[0] == 0))
62
     {
63
 	nmCurrentNetlist = NULL;
64
-	return;
65
+	return 0;
66
     }
67
 
68
     /* First of all, see if this netlist is already loaded. */
69
@@ -412,7 +412,7 @@
70
 	if (strcmp(name, new->nl_name) == 0)
71
 	{
72
 	    nmCurrentNetlist = new;
73
-	    return;
74
+	    return 0;
75
 	}
76
     }
77
 
78
@@ -440,7 +440,7 @@
79
 	TxError("Creating new netlist.\n");
80
 	new->nl_fileName = mallocMagic((unsigned) (5 + strlen(name)));
81
 	(void) sprintf(new->nl_fileName, "%s.net", name);
82
-	return;
83
+	return 0;
84
     }
85
     (void) StrDup(&new->nl_fileName, fullName);
86
     if ((fgets(line, MAXLINESIZE, file) == NULL)
87
@@ -450,7 +450,7 @@
88
 	TxError("%s isn't a legal netlist file.\n", new->nl_fileName);
89
 	TxError("Creating new netlist.\n");
90
 	(void) fclose(file);
91
-	return;
92
+	return 0;
93
     }
94
 
95
     /* Read nets from the file one at a time.  Each net consists of
96
@@ -756,7 +756,7 @@
97
     if (nmCurrentNetlist == NULL)
98
     {
99
 	TxError("There isn't a current net list to write.\n");
100
-	return;
101
+	return 0;
102
     }
103
 
104
     /* Decide what file to use to write the file (if an explicit name
105
@@ -776,8 +776,8 @@
106
 	    (void) fclose(file);
107
 	    TxPrintf("Net list file %s already exists.", realName);
108
 	    TxPrintf("  Should I overwrite it? [no] ");
109
-	    if (TxGetLine(line, 50) == (char *) NULL) return;
110
-	    if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0)) return;
111
+	    if (TxGetLine(line, 50) == (char *) NULL) return 0;
112
+	    if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0)) return 0;
113
 	}
114
     }
115
 
116
@@ -786,7 +786,7 @@
117
     if (file == NULL)
118
     {
119
 	TxError("Couldn't write file %s.\n", realName);
120
-	return;
121
+	return 0;
122
     }
123
     fprintf(file, " Netlist File\n");
124
     (void) NMEnumNets(nmWriteNetsFunc, (ClientData) file);
125
@@ -906,12 +906,12 @@
126
 	    case 1:
127
 		break;
128
 	    case 2:
129
-		return;
130
+		return 0;
131
 	}
132
     }
133
 
134
     nmCurrentNetlist = saveCurrent;
135
-    return;
136
+    return 0;
137
 }
138
 
139
 /*
(-)cad/magic/files/patch-netmenu__NMshowpt.c (+13 lines)
Line 0 Link Here
1
--- netmenu/NMshowpt.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMshowpt.c	2012-09-13 00:10:41.000000000 +0900
3
@@ -86,8 +86,8 @@
4
      * root definition for this window is the edit's root definition.
5
      */
6
 
7
-    if (nmspArrayUsed == 0) return;
8
-    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return;
9
+    if (nmspArrayUsed == 0) return 0;
10
+    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return 0;
11
 
12
     for (i = 0; i < nmspArrayUsed; i += 1)
13
     {
(-)cad/magic/files/patch-netmenu__NMshwcell.c (+38 lines)
Line 0 Link Here
1
--- netmenu/NMshowcell.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMshowcell.c	2012-09-13 00:21:50.000000000 +0900
3
@@ -92,7 +92,7 @@
4
      * this window.
5
      */
6
 
7
-    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return;
8
+    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return 0;
9
 
10
     /* If this window is zoomed way out (less than 1 pixel per lambda)
11
      * use solid highlighting to maximize visibility.  It the window
12
@@ -109,7 +109,7 @@
13
      * redraw.
14
      */
15
 
16
-    if (!DBBoundPlane(plane, &area)) return;
17
+    if (!DBBoundPlane(plane, &area)) return 0;
18
     nmscPlane = plane;
19
     for (i = PL_TECHDEPBASE; i < DBNumPlanes; i += 1)
20
     {
21
@@ -330,7 +330,7 @@
22
 	if (NMCurNetName == NULL)
23
 	{
24
 	    TxError("You must select a net before you can trace it.\n");
25
-	    return;
26
+	    return 0;
27
 	}
28
 	else netName = NMCurNetName;
29
     }
30
@@ -344,7 +344,7 @@
31
     {
32
 	TxError("The net list has no net containing the terminal \"%s\"\n",
33
 	    netName);
34
-	return;
35
+	return 0;
36
     }
37
     (void) NMEnumTerms(NMCurNetName, nmShowRoutedNetFunc,
38
 	    (ClientData) EditCellUse);
(-)cad/magic/files/patch-netmenu__NMwiring.c (+20 lines)
Line 0 Link Here
1
--- netmenu/NMwiring.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMwiring.c	2012-09-13 00:30:35.000000000 +0900
3
@@ -162,7 +162,7 @@
4
     /* Collect all the connected areas together into a list. */
5
 
6
     list = NULL;
7
-    if (!ToolGetEditBox(&area)) return;
8
+    if (!ToolGetEditBox(&area)) return 0;
9
 
10
     /* Expand the box to get everything touching it. */
11
 
12
@@ -537,7 +537,7 @@
13
     Rect area;
14
     char *net = NULL;
15
 
16
-    if (!ToolGetEditBox(&area)) return;
17
+    if (!ToolGetEditBox(&area)) return 0;
18
 
19
     /* Expand the box area so we'll pick up everything touching it. */
20
 
(-)cad/magic/files/patch-plow__PlowMain.c (+11 lines)
Line 0 Link Here
1
--- plow/PlowMain.c.orig	2006-04-11 07:03:13.000000000 +0900
2
+++ plow/PlowMain.c	2012-09-13 00:34:13.000000000 +0900
3
@@ -1182,7 +1182,7 @@
4
     Rect r, newEdgeR;
5
 
6
     if (PlowJogHorizon == 0)
7
-	return;
8
+	return 0;
9
 
10
     horizonTop = edge->e_ytop + PlowJogHorizon;
11
     horizonBot = edge->e_ybot - PlowJogHorizon;
(-)cad/magic/files/patch-plow__PlowRules1.c (+11 lines)
Line 0 Link Here
1
--- plow/PlowRules1.c.orig	2006-04-11 07:03:13.000000000 +0900
2
+++ plow/PlowRules1.c	2012-09-13 00:36:26.000000000 +0900
3
@@ -547,7 +547,7 @@
4
      * we play conservative and just use the maximum halo size.
5
      */
6
     if (plowMaxDist[edge->e_ltype] == 0)
7
-	return;
8
+	return 0;
9
     ar.ar_clip.p_x = edge->e_newx;
10
     ar.ar_clip.p_y = edge->e_ybot - plowMaxDist[edge->e_ltype];
11
     startPoint.p_x = edge->e_x;
(-)cad/magic/files/patch-plow__PlowRules2.c (+29 lines)
Line 0 Link Here
1
--- plow/PlowRules2.c.orig	2007-04-21 02:57:00.000000000 +0900
2
+++ plow/PlowRules2.c	2012-09-13 00:39:42.000000000 +0900
3
@@ -250,7 +250,7 @@
4
     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &p);
5
     pr = plowSpacingRulesTbl[edge->e_ltype][TiGetTypeExact(tp)];
6
     if (pr == (PlowRule *) NULL)
7
-	return;
8
+	return 0;
9
 
10
     searchRect.r_xbot = edge->e_x - 1;
11
     searchRect.r_ytop = edge->e_ybot;
12
@@ -514,7 +514,7 @@
13
     startPoint.p_y = edge->e_ybot - 1;
14
     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &startPoint);
15
     if (TiGetTypeExact(tp) == TT_SPACE)
16
-	return;
17
+	return 0;
18
 
19
     ltype = edge->e_ltype;
20
     rtype = TiGetTypeExact(tp);
21
@@ -604,7 +604,7 @@
22
 		GMASK_EAST|GMASK_WEST|GMASK_NORTH|GMASK_SOUTH,
23
 		plowIllegalBotProc, (ClientData) &ar);
24
     if (ar.ar_slivtype == (TileType) -1)
25
-	return;
26
+	return 0;
27
 
28
     startPoint.p_x = ar.ar_mustmove;
29
     TTMaskSetOnlyType(&insideTypes, ar.ar_slivtype);
(-)cad/magic/files/patch-windows__windDisp.c (+11 lines)
Line 0 Link Here
1
--- windows/windDisp.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ windows/windDisp.c	2012-09-13 00:42:00.000000000 +0900
3
@@ -81,7 +81,7 @@
4
     MagWindow *sw, *tw;
5
     int wct = 0;
6
 
7
-    if (*w != NULL) return;
8
+    if (*w != NULL) return 0;
9
 
10
     if (windTopWindow != NULL)
11
     {

Return to bug 171972