Attachment 77911 Details for Bug 59830 – 0001-jsauthority-Use-JSVAL_NULL-rather-than-0-struct-init.patch

[patch] 0001-jsauthority-Use-JSVAL_NULL-rather-than-0-struct-init.patch

0001-jsauthority-Use-JSVAL_NULL-rather-than-0-struct-init.patch (text/plain), 1.84 KB, created by Colin Walters on 2013-04-12 21:24:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2013-04-12 21:24:08 UTC

Size: 1.84 KB

patch

obsolete

>From 63d37b580a393cd660f062eb5f14adaa84ba75e9 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Fri, 12 Apr 2013 14:22:49 -0400
>Subject: [PATCH 1/3] jsauthority: Use JSVAL_NULL rather than {0} struct initialization
>
>This is future compatible with mozjs-17.0.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=59830
>---
> src/polkitbackend/polkitbackendjsauthority.c |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
>index f66f436..de72ebd 100644
>--- a/src/polkitbackend/polkitbackendjsauthority.c
>+++ b/src/polkitbackend/polkitbackendjsauthority.c
>@@ -425,8 +425,8 @@ load_scripts (PolkitBackendJsAuthority  *authority)
> static void
> reload_scripts (PolkitBackendJsAuthority *authority)
> {
>-  jsval argv[1] = {0};
>-  jsval rval = {0};
>+  jsval argv[1] = {JSVAL_NULL};
>+  jsval rval = JSVAL_NULL;
> 
>   if (!dJS_CallFunctionName (authority->priv->cx,
>                              authority->priv->js_polkit,
>@@ -1143,8 +1143,8 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA
> {
>   PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority);
>   GList *ret = NULL;
>-  jsval argv[2] = {0};
>-  jsval rval = {0};
>+  jsval argv[2] = {JSVAL_NULL, JSVAL_NULL};
>+  jsval rval = JSVAL_NULL;
>   guint n;
>   GError *error = NULL;
>   JSString *ret_jsstr;
>@@ -1253,8 +1253,8 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu
> {
>   PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority);
>   PolkitImplicitAuthorization ret = implicit;
>-  jsval argv[2] = {0};
>-  jsval rval = {0};
>+  jsval argv[2] = {JSVAL_NULL, JSVAL_NULL};
>+  jsval rval = JSVAL_NULL; 
>   GError *error = NULL;
>   JSString *ret_jsstr;
>   const jschar *ret_utf16;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 59830: 73627 | 73628 | 77911 | 77912 | 77913

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.