tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: mark const string array contents const too, i.e. static 

const char *array => static const char * const array from Mike Frysinger

OpenBSD-Commit-ID: a664e31ea6a795d7c81153274a5f47b22bdc9bc1
This commit is contained in:
djm@openbsd.org 2022-02-01 23:32:51 +00:00 committed by Damien Miller
parent 8cfa73f8a2
commit 541667fe6d
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth-rhosts.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-rhosts.c,v 1.53 2020/10/18 11:32:01 djm Exp $ */ /* $OpenBSD: auth-rhosts.c,v 1.54 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -191,7 +191,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
{ {
char buf[1024]; char buf[1024];
struct stat st; struct stat st;
static const char *rhosts_files[] = {".shosts", ".rhosts", NULL}; static const char * const rhosts_files[] = {".shosts", ".rhosts", NULL};
u_int rhosts_file_index; u_int rhosts_file_index;
debug2("auth_rhosts2: clientuser %s hostname %s ipaddr %s", debug2("auth_rhosts2: clientuser %s hostname %s ipaddr %s",

4
dns.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.c,v 1.41 2021/07/19 03:13:28 dtucker Exp $ */ /* $OpenBSD: dns.c,v 1.42 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -43,7 +43,7 @@
#include "log.h" #include "log.h"
#include "digest.h" #include "digest.h"
static const char *errset_text[] = { static const char * const errset_text[] = {
"success", /* 0 ERRSET_SUCCESS */ "success", /* 0 ERRSET_SUCCESS */
"out of memory", /* 1 ERRSET_NOMEMORY */ "out of memory", /* 1 ERRSET_NOMEMORY */
"general failure", /* 2 ERRSET_FAIL */ "general failure", /* 2 ERRSET_FAIL */

4
kex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.c,v 1.171 2022/01/06 21:55:23 djm Exp $ */ /* $OpenBSD: kex.c,v 1.172 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* *
@ -66,7 +66,7 @@
static int kex_choose_conf(struct ssh *); static int kex_choose_conf(struct ssh *);
static int kex_input_newkeys(int, u_int32_t, struct ssh *); static int kex_input_newkeys(int, u_int32_t, struct ssh *);
static const char *proposal_names[PROPOSAL_MAX] = { static const char * const proposal_names[PROPOSAL_MAX] = {
"KEX algorithms", "KEX algorithms",
"host key algorithms", "host key algorithms",
"ciphers ctos", "ciphers ctos",

10
nchan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: nchan.c,v 1.73 2021/05/19 01:24:05 djm Exp $ */ /* $OpenBSD: nchan.c,v 1.74 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
* *
@ -82,8 +82,12 @@ static void chan_shutdown_write(struct ssh *, Channel *);
static void chan_shutdown_read(struct ssh *, Channel *); static void chan_shutdown_read(struct ssh *, Channel *);
static void chan_shutdown_extended_read(struct ssh *, Channel *); static void chan_shutdown_extended_read(struct ssh *, Channel *);
static const char *ostates[] = { "open", "drain", "wait_ieof", "closed" }; static const char * const ostates[] = {
static const char *istates[] = { "open", "drain", "wait_oclose", "closed" }; "open", "drain", "wait_ieof", "closed",
};
static const char * const istates[] = {
"open", "drain", "wait_oclose", "closed",
};
static void static void
chan_set_istate(Channel *c, u_int next) chan_set_istate(Channel *c, u_int next)

4
sftp-server.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-server.c,v 1.138 2022/01/14 03:31:52 djm Exp $ */ /* $OpenBSD: sftp-server.c,v 1.139 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -520,7 +520,7 @@ send_msg(struct sshbuf *m)
static const char * static const char *
status_to_message(u_int32_t status) status_to_message(u_int32_t status)
{ {
const char *status_messages[] = { static const char * const status_messages[] = {
"Success", /* SSH_FX_OK */ "Success", /* SSH_FX_OK */
"End of file", /* SSH_FX_EOF */ "End of file", /* SSH_FX_EOF */
"No such file", /* SSH_FX_NO_SUCH_FILE */ "No such file", /* SSH_FX_NO_SUCH_FILE */

4
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.447 2022/01/05 21:54:37 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.448 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2460,7 +2460,7 @@ load_sign_key(const char *keypath, const struct sshkey *pubkey)
{ {
size_t i, slen, plen = strlen(keypath); size_t i, slen, plen = strlen(keypath);
char *privpath = xstrdup(keypath); char *privpath = xstrdup(keypath);
const char *suffixes[] = { "-cert.pub", ".pub", NULL }; static const char * const suffixes[] = { "-cert.pub", ".pub", NULL };
struct sshkey *ret = NULL, *privkey = NULL; struct sshkey *ret = NULL, *privkey = NULL;
int r; int r;

4
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.355 2022/01/06 22:06:51 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.356 2022/02/01 23:32:51 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -1318,7 +1318,7 @@ identity_sign(struct identity *id, u_char **sigp, size_t *lenp,
static int static int
id_filename_matches(Identity *id, Identity *private_id) id_filename_matches(Identity *id, Identity *private_id)
{ {
const char *suffixes[] = { ".pub", "-cert.pub", NULL }; static const char * const suffixes[] = { ".pub", "-cert.pub", NULL };
size_t len = strlen(id->filename), plen = strlen(private_id->filename); size_t len = strlen(id->filename), plen = strlen(private_id->filename);
size_t i, slen; size_t i, slen;