From fef5d0af591c6c8a91f69bba5e62c99df1a732c9 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 1 Feb 2008 19:54:46 +0000
Subject: Constantise as much as possible so that it reduces COW usage.

---
 src/rc/checkpath.c         | 2 +-
 src/rc/fstabinfo.c         | 2 +-
 src/rc/mountinfo.c         | 2 +-
 src/rc/rc-depend.c         | 2 +-
 src/rc/rc-status.c         | 2 +-
 src/rc/rc-update.c         | 2 +-
 src/rc/rc.c                | 2 +-
 src/rc/runscript.c         | 2 +-
 src/rc/start-stop-daemon.c | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/rc')

diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index 74bed53f..51780329 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -161,7 +161,7 @@ static int parse_owner (struct passwd **user, struct group **group,
 #include "_usage.h"
 #define extraopts "path1 path2 ..."
 #define getoptstring "dfm:o:" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "directory",      0, NULL, 'd'},
 	{ "file",           0, NULL, 'f'},
 	{ "mode",           1, NULL, 'm'},
diff --git a/src/rc/fstabinfo.c b/src/rc/fstabinfo.c
index 4b674bc4..446f9bee 100644
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -90,7 +90,7 @@ static const char *applet = NULL;
 
 #include "_usage.h"
 #define getoptstring "bmop:t:" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "blockdevice",    0, NULL, 'b' },
 	{ "options",        0, NULL, 'o' },
 	{ "passno",         1, NULL, 'p' },
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index 0d8d7a1c..b15a50a3 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -335,7 +335,7 @@ static regex_t *get_regex (const char *string)
 #include "_usage.h"
 #define extraopts "[mount1] [mount2] ..."
 #define getoptstring "f:F:n:N:o:O:p:P:ist" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "fstype-regex",        1, NULL, 'f'},
 	{ "skip-fstype-regex",   1, NULL, 'F'},
 	{ "node-regex",          1, NULL, 'n'},
diff --git a/src/rc/rc-depend.c b/src/rc/rc-depend.c
index be998c40..0bb4c213 100644
--- a/src/rc/rc-depend.c
+++ b/src/rc/rc-depend.c
@@ -64,7 +64,7 @@ rc_depinfo_t *_rc_deptree_load (int *regen) {
 
 #include "_usage.h"
 #define getoptstring "t:suT" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "type",     1, NULL, 't'},
 	{ "notrace",  0, NULL, 'T'},
 	{ "strict",   0, NULL, 's'},
diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c
index 92822483..0b2b3ec1 100644
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -43,7 +43,7 @@
 
 static const char *applet;
 
-static const char *types_nua[] = { "ineed", "iuse", "iafter", NULL };
+static const char *const types_nua[] = { "ineed", "iuse", "iafter", NULL };
 
 static void print_level (char *level)
 {
diff --git a/src/rc/rc-update.c b/src/rc/rc-update.c
index 72b94a3a..38d4242d 100644
--- a/src/rc/rc-update.c
+++ b/src/rc/rc-update.c
@@ -134,7 +134,7 @@ static void show (char **runlevels, bool verbose)
 	"       rc-update [options] del service <runlevel>\n" \
 	"       rc-update [options] show"
 #define getoptstring getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	longopts_COMMON
 };
 static const char * const longopts_help[] = {
diff --git a/src/rc/rc.c b/src/rc/rc.c
index 954d6b59..f093b874 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -636,7 +636,7 @@ static void do_coldplug (void)
 
 #include "_usage.h"
 #define getoptstring "o:" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "override", 1, NULL, 'o' },
 	longopts_COMMON
 };
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 458ecd2d..dfabb86b 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -1027,7 +1027,7 @@ static void svc_restart (bool deps)
 #include "_usage.h"
 #define getoptstring "dDsv" getoptstring_COMMON
 #define extraopts "stop | start | restart | describe | zap"
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "debug",      0, NULL, 'd'},
 	{ "ifstarted",  0, NULL, 's'},
 	{ "nodeps",     0, NULL, 'D'},
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index 43d1d3d8..5a524d99 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -487,7 +487,7 @@ static void handle_signal (int sig)
 
 #include "_usage.h"
 #define getoptstring "KN:R:Sbc:d:g:mn:op:s:tu:r:x:1:2:" getoptstring_COMMON
-static struct option longopts[] = {
+static const struct option longopts[] = {
 	{ "stop",         0, NULL, 'K'},
 	{ "nicelevel",    1, NULL, 'N'},
 	{ "retry",        1, NULL, 'R'},
-- 
cgit v1.2.3