Use XtOffsetOf() in url_scanner_ex

nikic · nikic · commit ab4f725d83cb · 2019-09-14T00:25:14.000+02:00
Instead of a manual implementation.
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
@@ -656,7 +656,7 @@ static int php_url_scanner_ex_activate(int type)
 		ctx = &BG(url_adapt_output_ex);
 	}
 
-	memset(ctx, 0, ((size_t) &((url_adapt_state_ex_t *)0)->tags));
+	memset(ctx, 0, XtOffsetOf(url_adapt_state_ex_t, tags));
 
 	return SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ static int php_url_scanner_ex_activate(int type)`
`656`	`656`	`ctx = &BG(url_adapt_output_ex);`
`657`	`657`	`}`
`658`	`658`
`659`		`- memset(ctx, 0, ((size_t) &((url_adapt_state_ex_t *)0)->tags));`
	`659`	`+ memset(ctx, 0, XtOffsetOf(url_adapt_state_ex_t, tags));`
`660`	`660`
`661`	`661`	`return SUCCESS;`
`662`	`662`	`}`