proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-27 15:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing #define for SSH_PREFIX_COUNT and using ARRAY_SIZE instead

Browse Source 
Also moving var declarations to top of blocks to support bad old compilers
This commit is contained in:
Chris Bargren 2015-12-28 07:43:24 -07:00 committed by Edward Thomson
parent 429155d516
commit e44f6586ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/transports/ssh.c
View File

@ -22,7 +22,6 @@
#define OWNING_SUBTRANSPORT(s) ((ssh_subtransport *)(s)->parent.subtransport) #define OWNING_SUBTRANSPORT(s) ((ssh_subtransport *)(s)->parent.subtransport)
static const char *ssh_prefixes[] = { "ssh://", "ssh+git://", "git+ssh://" }; static const char *ssh_prefixes[] = { "ssh://", "ssh+git://", "git+ssh://" };
#define SSH_PREFIX_COUNT (sizeof(ssh_prefixes) / sizeof(ssh_prefixes[0]))
static const char cmd_uploadpack[] = "git-upload-pack"; static const char cmd_uploadpack[] = "git-upload-pack";
static const char cmd_receivepack[] = "git-receive-pack"; static const char cmd_receivepack[] = "git-receive-pack";
@ -65,9 +64,9 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url)
{ {
char *repo; char *repo;
int len; int len;
size_t i;
size_t i = 0; for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) {
for (i = 0; i < SSH_PREFIX_COUNT; ++i) {
const char *p = ssh_prefixes[i]; const char *p = ssh_prefixes[i];
if (!git__prefixcmp(url, p)) { if (!git__prefixcmp(url, p)) {
@ -509,6 +508,7 @@ static int _git_ssh_setup_conn(
char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL; char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL;
const char *default_port="22"; const char *default_port="22";
int auth_methods, error = 0; int auth_methods, error = 0;
size_t i;
ssh_stream *s; ssh_stream *s;
git_cred *cred = NULL; git_cred *cred = NULL;
LIBSSH2_SESSION* session=NULL; LIBSSH2_SESSION* session=NULL;
@ -524,8 +524,7 @@ static int _git_ssh_setup_conn(
s->session = NULL; s->session = NULL;
s->channel = NULL; s->channel = NULL;
size_t i = 0; for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) {
for (i = 0; i < SSH_PREFIX_COUNT; ++i) {
const char *p = ssh_prefixes[i]; const char *p = ssh_prefixes[i];
if (!git__prefixcmp(url, p)) { if (!git__prefixcmp(url, p)) {