diff options
author | Alex Elder <elder@inktank.com> | 2013-02-19 13:25:56 -0500 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-02-25 16:37:18 -0500 |
commit | 154171678989950f6c392e126fa8006a145ed1cc (patch) | |
tree | ec223720a5dac808685e4a49fe570055a9007987 /net/ceph/crypto.c | |
parent | 2c3dd4ff595e604cd4c4c51cff7a208f23148c2d (diff) |
libceph: eliminate sparse warnings
Eliminate most of the problems in the libceph code that cause sparse
to issue warnings.
- Convert functions that are never referenced externally to have
static scope.
- Pass NULL rather than 0 for a pointer argument in one spot in
ceph_monc_delete_snapid()
This partially resolves:
http://tracker.ceph.com/issues/4184
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/crypto.c')
-rw-r--r-- | net/ceph/crypto.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index af14cb425164..6e7a236525b6 100644 --- a/net/ceph/crypto.c +++ b/net/ceph/crypto.c | |||
@@ -423,7 +423,8 @@ int ceph_encrypt2(struct ceph_crypto_key *secret, void *dst, size_t *dst_len, | |||
423 | } | 423 | } |
424 | } | 424 | } |
425 | 425 | ||
426 | int ceph_key_instantiate(struct key *key, struct key_preparsed_payload *prep) | 426 | static int ceph_key_instantiate(struct key *key, |
427 | struct key_preparsed_payload *prep) | ||
427 | { | 428 | { |
428 | struct ceph_crypto_key *ckey; | 429 | struct ceph_crypto_key *ckey; |
429 | size_t datalen = prep->datalen; | 430 | size_t datalen = prep->datalen; |
@@ -458,12 +459,12 @@ err: | |||
458 | return ret; | 459 | return ret; |
459 | } | 460 | } |
460 | 461 | ||
461 | int ceph_key_match(const struct key *key, const void *description) | 462 | static int ceph_key_match(const struct key *key, const void *description) |
462 | { | 463 | { |
463 | return strcmp(key->description, description) == 0; | 464 | return strcmp(key->description, description) == 0; |
464 | } | 465 | } |
465 | 466 | ||
466 | void ceph_key_destroy(struct key *key) { | 467 | static void ceph_key_destroy(struct key *key) { |
467 | struct ceph_crypto_key *ckey = key->payload.data; | 468 | struct ceph_crypto_key *ckey = key->payload.data; |
468 | 469 | ||
469 | ceph_crypto_key_destroy(ckey); | 470 | ceph_crypto_key_destroy(ckey); |