From patchwork Sat Dec 20 22:36:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 423136 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 63E241400A0 for ; Sun, 21 Dec 2014 09:34:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644AbaLTWdz (ORCPT ); Sat, 20 Dec 2014 17:33:55 -0500 Received: from mail-wi0-f182.google.com ([209.85.212.182]:48764 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbaLTWdx (ORCPT ); Sat, 20 Dec 2014 17:33:53 -0500 Received: by mail-wi0-f182.google.com with SMTP id h11so4916856wiw.15 for ; Sat, 20 Dec 2014 14:33:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uxcF1V5bbRrwxK0SR44Rb1Xb2jWM8JwHIJKp1gNp/us=; b=aSKBjUguyULSWQmOe8vAjt9yTFS79j752q9Kn2TsfdbEAiz4VbSbOSrm0npFW9W1yo ATz1P+4CX10Z+VD20qfFaH1Jk4+azptTjUyoSAm7slq1V2qNEy6HAUVSV7qUYe0mPXFP ILfOxqSAW9PAExmZMTBQFPO4vrreg4BLSW1eQXucVDyPdJjf8zsJO6aphlSJFR2l4IiX zsZmBx8s45v427OwmWLyge3QM61IZVlHhaoy7ItrrXVMBR3OtETUTczMsnEk40+DT8VT HYjH/tI8mz3CZe/DKlyghGZQRezxQ8hrjkzHPazZQtSUsFp9GpxC88m7n4PgO5G3r7LZ bSYQ== X-Gm-Message-State: ALoCoQkTx5+Eo/Aur5jOwRkQKf2+QCCZTdcqixchuQNXvLto0tzKoehcza8U83Dn+fwzJ7Q+T9Xs X-Received: by 10.180.228.37 with SMTP id sf5mr18133208wic.35.1419114832841; Sat, 20 Dec 2014 14:33:52 -0800 (PST) Received: from localhost.localdomain (h-246-111.a218.priv.bahnhof.se. [85.24.246.111]) by mx.google.com with ESMTPSA id u18sm17722675wjq.42.2014.12.20.14.33.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Dec 2014 14:33:52 -0800 (PST) From: Rickard Strandqvist To: Sage Weil , "David S. Miller" Cc: Rickard Strandqvist , ceph-devel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: ceph: armor.c: Remove unused function Date: Sat, 20 Dec 2014 23:36:40 +0100 Message-Id: <1419115000-12178-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove the function ceph_armor() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist --- net/ceph/armor.c | 39 --------------------------------------- net/ceph/crypto.h | 1 - 2 files changed, 40 deletions(-) diff --git a/net/ceph/armor.c b/net/ceph/armor.c index 1fc1ee1..05e0d2b 100644 --- a/net/ceph/armor.c +++ b/net/ceph/armor.c @@ -1,7 +1,6 @@ #include -int ceph_armor(char *dst, const char *src, const char *end); int ceph_unarmor(char *dst, const char *src, const char *end); /* @@ -33,44 +32,6 @@ static int decode_bits(char c) return -EINVAL; } -int ceph_armor(char *dst, const char *src, const char *end) -{ - int olen = 0; - int line = 0; - - while (src < end) { - unsigned char a, b, c; - - a = *src++; - *dst++ = encode_bits(a >> 2); - if (src < end) { - b = *src++; - *dst++ = encode_bits(((a & 3) << 4) | (b >> 4)); - if (src < end) { - c = *src++; - *dst++ = encode_bits(((b & 15) << 2) | - (c >> 6)); - *dst++ = encode_bits(c & 63); - } else { - *dst++ = encode_bits((b & 15) << 2); - *dst++ = '='; - } - } else { - *dst++ = encode_bits(((a & 3) << 4)); - *dst++ = '='; - *dst++ = '='; - } - olen += 4; - line += 4; - if (line == 64) { - line = 0; - *(dst++) = '\n'; - olen++; - } - } - return olen; -} - int ceph_unarmor(char *dst, const char *src, const char *end) { int olen = 0; diff --git a/net/ceph/crypto.h b/net/ceph/crypto.h index d149822..5cbc7b1 100644 --- a/net/ceph/crypto.h +++ b/net/ceph/crypto.h @@ -45,7 +45,6 @@ int ceph_crypto_init(void); void ceph_crypto_shutdown(void); /* armor.c */ -int ceph_armor(char *dst, const char *src, const char *end); int ceph_unarmor(char *dst, const char *src, const char *end); #endif