diff options
| author | guenther <> | 2019-07-14 03:30:46 +0000 |
|---|---|---|
| committer | guenther <> | 2019-07-14 03:30:46 +0000 |
| commit | ce9daaa0080f6ec467441aa485eb3f11ad6fb74a (patch) | |
| tree | 5082b2b4a1bbd244a864f580178d406f6a694e72 /src/usr.bin/openssl/apps.c | |
| parent | e9ef26d0b799866960d5d8ea8c87d53cea6b50ff (diff) | |
| download | openbsd-ce9daaa0080f6ec467441aa485eb3f11ad6fb74a.tar.gz openbsd-ce9daaa0080f6ec467441aa485eb3f11ad6fb74a.tar.bz2 openbsd-ce9daaa0080f6ec467441aa485eb3f11ad6fb74a.zip | |
Mark the initialized struct options arrays as both static and const.
This moves them from .data to .data.rel.ro
ok deraadt@ inoguchi@
Diffstat (limited to 'src/usr.bin/openssl/apps.c')
| -rw-r--r-- | src/usr.bin/openssl/apps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 39ce7a5f34..c9a2f34b25 100644 --- a/src/usr.bin/openssl/apps.c +++ b/src/usr.bin/openssl/apps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: apps.c,v 1.53 2019/07/03 03:24:02 deraadt Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.54 2019/07/14 03:30:45 guenther Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -2122,7 +2122,7 @@ app_isdir(const char *name) | |||
| 2122 | #define OPTION_WIDTH 18 | 2122 | #define OPTION_WIDTH 18 |
| 2123 | 2123 | ||
| 2124 | void | 2124 | void |
| 2125 | options_usage(struct option *opts) | 2125 | options_usage(const struct option *opts) |
| 2126 | { | 2126 | { |
| 2127 | const char *p, *q; | 2127 | const char *p, *q; |
| 2128 | char optstr[32]; | 2128 | char optstr[32]; |
| @@ -2149,11 +2149,11 @@ options_usage(struct option *opts) | |||
| 2149 | } | 2149 | } |
| 2150 | 2150 | ||
| 2151 | int | 2151 | int |
| 2152 | options_parse(int argc, char **argv, struct option *opts, char **unnamed, | 2152 | options_parse(int argc, char **argv, const struct option *opts, char **unnamed, |
| 2153 | int *argsused) | 2153 | int *argsused) |
| 2154 | { | 2154 | { |
| 2155 | const char *errstr; | 2155 | const char *errstr; |
| 2156 | struct option *opt; | 2156 | const struct option *opt; |
| 2157 | long long val; | 2157 | long long val; |
| 2158 | char *arg, *p; | 2158 | char *arg, *p; |
| 2159 | int fmt, used; | 2159 | int fmt, used; |
