{"id":807786,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807786/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<393d6a245f52394f0aa094ec1e97194aef9ab0bc.1504112061.git.jcody@redhat.com>","date":"2017-08-30T16:56:59","name":"[v2,2/7] block/ssh: make compliant with coding guidelines","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7597b098052ebe451ac371516587bf20eb1ece0b","submitter":{"id":12159,"url":"http://patchwork.ozlabs.org/api/1.0/people/12159/?format=json","name":"Jeff Cody","email":"jcody@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/393d6a245f52394f0aa094ec1e97194aef9ab0bc.1504112061.git.jcody@redhat.com/mbox/","series":[{"id":664,"url":"http://patchwork.ozlabs.org/api/1.0/series/664/?format=json","date":"2017-08-30T16:56:58","name":"Code cleanup and minor fixes","version":2,"mbox":"http://patchwork.ozlabs.org/series/664/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807786/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jcody@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjCGM6tLWz9sN5\n\tfor ;\n\tThu, 31 Aug 2017 03:31:07 +1000 (AEST)","from localhost ([::1]:51797 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6pV-0002im-Ig\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:31:05 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58369)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Ik-0005Tq-0A\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Ii-0006pV-U2\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:14 -0400","from mx1.redhat.com ([209.132.183.28]:44712)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dn6If-0006mZ-01; Wed, 30 Aug 2017 12:57:09 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id DF352495;\n\tWed, 30 Aug 2017 16:57:07 +0000 (UTC)","from localhost (ovpn-116-70.phx2.redhat.com [10.3.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id AB09E6951E;\n\tWed, 30 Aug 2017 16:57:07 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DF352495","From":"Jeff Cody ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 12:56:59 -0400","Message-Id":"<393d6a245f52394f0aa094ec1e97194aef9ab0bc.1504112061.git.jcody@redhat.com>","In-Reply-To":["",""],"References":["",""],"X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tWed, 30 Aug 2017 16:57:08 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/7] block/ssh: make compliant with coding\n\tguidelines","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"mitake.hitoshi@lab.ntt.co.jp, namei.unix@gmail.com, kwolf@redhat.com,\n\trjones@redhat.com, qemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Jeff Cody \n---\n block/ssh.c | 32 ++++++++++++++++++--------------\n 1 file changed, 18 insertions(+), 14 deletions(-)","diff":"diff --git a/block/ssh.c b/block/ssh.c\nindex cbb0e34..97f7673 100644\n--- a/block/ssh.c\n+++ b/block/ssh.c\n@@ -241,7 +241,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp)\n goto err;\n }\n \n- if(uri->user && strcmp(uri->user, \"\") != 0) {\n+ if (uri->user && strcmp(uri->user, \"\") != 0) {\n qdict_put_str(options, \"user\", uri->user);\n }\n \n@@ -268,7 +268,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp)\n \n err:\n if (uri) {\n- uri_free(uri);\n+ uri_free(uri);\n }\n return -EINVAL;\n }\n@@ -342,7 +342,7 @@ static int check_host_key_knownhosts(BDRVSSHState *s,\n libssh2_knownhost_readfile(knh, knh_file, LIBSSH2_KNOWNHOST_FILE_OPENSSH);\n \n r = libssh2_knownhost_checkp(knh, host, port, hostkey, len,\n- LIBSSH2_KNOWNHOST_TYPE_PLAIN|\n+ LIBSSH2_KNOWNHOST_TYPE_PLAIN |\n LIBSSH2_KNOWNHOST_KEYENC_RAW,\n &found);\n switch (r) {\n@@ -405,15 +405,18 @@ static int compare_fingerprint(const unsigned char *fingerprint, size_t len,\n unsigned c;\n \n while (len > 0) {\n- while (*host_key_check == ':')\n+ while (*host_key_check == ':') {\n host_key_check++;\n+ }\n if (!qemu_isxdigit(host_key_check[0]) ||\n- !qemu_isxdigit(host_key_check[1]))\n+ !qemu_isxdigit(host_key_check[1])) {\n return 1;\n+ }\n c = hex2decimal(host_key_check[0]) * 16 +\n hex2decimal(host_key_check[1]);\n- if (c - *fingerprint != 0)\n+ if (c - *fingerprint != 0) {\n return c - *fingerprint;\n+ }\n fingerprint++;\n len--;\n host_key_check += 2;\n@@ -433,8 +436,8 @@ check_host_key_hash(BDRVSSHState *s, const char *hash,\n return -EINVAL;\n }\n \n- if(compare_fingerprint((unsigned char *) fingerprint, fingerprint_len,\n- hash) != 0) {\n+ if (compare_fingerprint((unsigned char *) fingerprint, fingerprint_len,\n+ hash) != 0) {\n error_setg(errp, \"remote host key does not match host_key_check '%s'\",\n hash);\n return -EPERM;\n@@ -507,7 +510,7 @@ static int authenticate(BDRVSSHState *s, const char *user, Error **errp)\n goto out;\n }\n \n- for(;;) {\n+ for (;;) {\n r = libssh2_agent_get_identity(agent, &identity, prev_identity);\n if (r == 1) { /* end of list */\n break;\n@@ -863,8 +866,8 @@ static int ssh_create(const char *filename, QemuOpts *opts, Error **errp)\n }\n \n r = connect_to_ssh(&s, uri_options,\n- LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE|\n- LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,\n+ LIBSSH2_FXF_READ | LIBSSH2_FXF_WRITE |\n+ LIBSSH2_FXF_CREAT | LIBSSH2_FXF_TRUNC,\n 0644, errp);\n if (r < 0) {\n ret = r;\n@@ -872,7 +875,7 @@ static int ssh_create(const char *filename, QemuOpts *opts, Error **errp)\n }\n \n if (total_size > 0) {\n- libssh2_sftp_seek64(s.sftp_handle, total_size-1);\n+ libssh2_sftp_seek64(s.sftp_handle, total_size - 1);\n r2 = libssh2_sftp_write(s.sftp_handle, c, 1);\n if (r2 < 0) {\n sftp_error_setg(errp, &s, \"truncate failed\");\n@@ -1111,7 +1114,7 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs,\n * works for me.\n */\n if (r == 0) {\n- ssh_seek(s, offset + written, SSH_SEEK_WRITE|SSH_SEEK_FORCE);\n+ ssh_seek(s, offset + written, SSH_SEEK_WRITE | SSH_SEEK_FORCE);\n co_yield(s, bs);\n goto again;\n }\n@@ -1125,8 +1128,9 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs,\n end_of_vec = i->iov_base + i->iov_len;\n }\n \n- if (offset + written > s->attrs.filesize)\n+ if (offset + written > s->attrs.filesize) {\n s->attrs.filesize = offset + written;\n+ }\n }\n \n return 0;\n","prefixes":["v2","2/7"]}