From patchwork Wed Nov 26 19:36:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 2169428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4dGqc433b9z1yDT for ; Thu, 27 Nov 2025 06:38:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type:List-Help: Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From:List-Post:List-Id: Message-ID:MIME-Version:Date:Subject:To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=hL4isbJ1z3jpUhFM5fUqsfZ1i9C6htvcHXLR1klR6+s=; b=3mwoXPE+mpR+P3Ce5CVURe1VOx MWtcc0w+gEgyRSkGkGwlw2DnaTFY7oPmohPCF7D3fS4UUHN/rvO9swWECy8jSM20fTy0DYMoEIb/w /gk4MXmOe+iLBCOkPFs+5WZCdkqV54A8wNJ3okbvlEOrFnny575sDeErnaqe+SPZ+8+MdCo603fib wWLy1WSeUnSm4RmgyhXEKRkTAhgBSTXmBdbBI4ErGEySS8zNcZs53orD9tgxKZIiXsoMOCQdCaKtR qZtGRFMoTeHXyz3BDEZcNPVhU8OYR9iNUeEEwyHlaT6PZCPznG2lEDg+DDrUZHZH7d9pMi1C9f3RF NjXCfFuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOLJi-0000000FYVQ-4AgD; Wed, 26 Nov 2025 19:36:42 +0000 To: openwrt-devel@lists.openwrt.org Subject: [PATCH procd 1/2] rcS, ubus: constify char * arguments and variables where appropriate Date: Wed, 26 Nov 2025 20:36:06 +0100 MIME-Version: 1.0 Message-ID: List-Id: OpenWrt Development List List-Post: X-Patchwork-Original-From: Nora Matthias Schiffer via openwrt-devel From: Matthias Schiffer Precedence: list X-Mailman-Version: 2.1.34 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Nora Matthias Schiffer List-Help: Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Signed-off-by: Nora Matthias Schiffer --- procd.h | 2 +- rcS.c | 10 +++++----- rcS.h | 4 ++-- ubus.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/procd.h b/procd.h index c656d3b..f48edeb 100644 --- a/procd.h +++ b/procd.h @@ -27,7 +27,7 @@ #define __init __attribute__((constructor)) -extern char *ubus_socket; +extern const char *ubus_socket; void procd_connect_ubus(void); void procd_reconnect_ubus(int reconnect); diff --git a/rcS.c b/rcS.c index bfaf50b..45a96a9 100644 --- a/rcS.c +++ b/rcS.c @@ -125,7 +125,7 @@ static void q_initd_complete(struct runqueue *q, struct runqueue_task *p) free(s); } -static bool find_runqueue_list_entry(struct list_head *list, char *file, char *param) +static bool find_runqueue_list_entry(struct list_head *list, const char *file, const char *param) { struct initd *s; @@ -135,7 +135,7 @@ static bool find_runqueue_list_entry(struct list_head *list, char *file, char *p return false; } -static void add_initd(struct runqueue *q, char *file, char *param) +static void add_initd(struct runqueue *q, const char *file, const char *param) { static const struct runqueue_task_type initd_type = { .run = q_initd_run, @@ -168,7 +168,7 @@ static void add_initd(struct runqueue *q, char *file, char *param) runqueue_task_add(q, &s->proc.task, false); } -static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param) +static int _rc(struct runqueue *q, const char *path, const char *file, const char *pattern, const char *param) { char *dir = alloca(2 + strlen(path) + strlen(file) + strlen(pattern)); glob_t gl; @@ -194,7 +194,7 @@ static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, return 0; } -int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *)) +int rcS(const char *pattern, const char *param, void (*q_empty)(struct runqueue *)) { runqueue_init(&q); q.empty_cb = q_empty; @@ -203,7 +203,7 @@ int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *)) return _rc(&q, "/etc/rc.d", pattern, "*", param); } -int rc(const char *file, char *param) +int rc(const char *file, const char *param) { return _rc(&r, "/etc/init.d", file, "", param); } diff --git a/rcS.h b/rcS.h index 91d37d1..9b6bb84 100644 --- a/rcS.h +++ b/rcS.h @@ -17,7 +17,7 @@ #include -extern int rcS(char *pattern, char *param, void (*q_empty)(struct runqueue *)); -extern int rc(const char *file, char *param); +extern int rcS(const char *pattern, const char *param, void (*q_empty)(struct runqueue *)); +extern int rc(const char *file, const char *param); #endif diff --git a/ubus.c b/ubus.c index b0b7c9a..23f640a 100644 --- a/ubus.c +++ b/ubus.c @@ -19,7 +19,7 @@ #include "procd.h" -char *ubus_socket = NULL; +const char *ubus_socket = NULL; static struct ubus_context *ctx; static struct uloop_timeout ubus_timer; static int timeout;