Commit 57c2b0c5 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib/util: remove _spdk prefix from functions. 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Id87b6eae46e7503796904676edfa22d821673a9a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2462


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 0af754f0

lib/util/base64.c

+13 −13
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ base64_urlsafe_dec_table[] = { 
};



static int

_spdk_base64_encode(char *dst, const char *enc_table, const void *src, size_t src_len)

base64_encode(char *dst, const char *enc_table, const void *src, size_t src_len)

{

	uint32_t raw_u32;
@@ -102,7 +102,7 @@ _spdk_base64_encode(char *dst, const char *enc_table, const void *src, size_t sr 
	}



#ifdef __aarch64__

	_spdk_base64_encode_neon64(&dst, enc_table, &src, &src_len);

	base64_encode_neon64(&dst, enc_table, &src, &src_len);

#endif



	while (src_len >= 4) {
@@ -139,22 +139,22 @@ out: 
int

spdk_base64_encode(char *dst, const void *src, size_t src_len)

{

	return _spdk_base64_encode(dst, base64_enc_table, src, src_len);

	return base64_encode(dst, base64_enc_table, src, src_len);

}



int

spdk_base64_urlsafe_encode(char *dst, const void *src, size_t src_len)

{

	return _spdk_base64_encode(dst, base64_urfsafe_enc_table, src, src_len);

	return base64_encode(dst, base64_urfsafe_enc_table, src, src_len);

}



#ifdef __aarch64__

static int

_spdk_base64_decode(void *dst, size_t *_dst_len, const uint8_t *dec_table,

base64_decode(void *dst, size_t *_dst_len, const uint8_t *dec_table,

	      const uint8_t *dec_table_opt, const char *src)

#else

static int

_spdk_base64_decode(void *dst, size_t *_dst_len, const uint8_t *dec_table, const char *src)

base64_decode(void *dst, size_t *_dst_len, const uint8_t *dec_table, const char *src)

#endif

{

	size_t src_strlen;
@@ -199,7 +199,7 @@ _spdk_base64_decode(void *dst, size_t *_dst_len, const uint8_t *dec_table, const 
	src_in = (const uint8_t *) src;



#ifdef __aarch64__

	_spdk_base64_decode_neon64(&dst, dec_table_opt, &src_in, &src_strlen);

	base64_decode_neon64(&dst, dec_table_opt, &src_in, &src_strlen);



	if (src_strlen == 0) {

		return 0;
@@ -244,9 +244,9 @@ int 
spdk_base64_decode(void *dst, size_t *dst_len, const char *src)

{

#ifdef __aarch64__

	return _spdk_base64_decode(dst, dst_len, base64_dec_table, base64_dec_table_neon64, src);

	return base64_decode(dst, dst_len, base64_dec_table, base64_dec_table_neon64, src);

#else

	return _spdk_base64_decode(dst, dst_len, base64_dec_table, src);

	return base64_decode(dst, dst_len, base64_dec_table, src);

#endif

}
@@ -254,9 +254,9 @@ int 
spdk_base64_urlsafe_decode(void *dst, size_t *dst_len, const char *src)

{

#ifdef __aarch64__

	return _spdk_base64_decode(dst, dst_len, base64_urlsafe_dec_table, base64_urlsafe_dec_table_neon64,

	return base64_decode(dst, dst_len, base64_urlsafe_dec_table, base64_urlsafe_dec_table_neon64,

			     src);

#else

	return _spdk_base64_decode(dst, dst_len, base64_urlsafe_dec_table, src);

	return base64_decode(dst, dst_len, base64_urlsafe_dec_table, src);

#endif

}

lib/util/base64_neon.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ load_64byte_table(const uint8_t *p) 
}



static void

_spdk_base64_encode_neon64(char **dst, const char *enc_table, const void **src, size_t *src_len)

base64_encode_neon64(char **dst, const char *enc_table, const void **src, size_t *src_len)

{

	const uint8x16x4_t tbl_enc = load_64byte_table(enc_table);
@@ -155,7 +155,7 @@ _spdk_base64_encode_neon64(char **dst, const char *enc_table, const void **src, 
}



static void

_spdk_base64_decode_neon64(void **dst, const uint8_t *dec_table_neon64, const uint8_t **src,

base64_decode_neon64(void **dst, const uint8_t *dec_table_neon64, const uint8_t **src,

		     size_t *src_len)

{

	/*

lib/util/bit_array.c

+9 −9
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ spdk_bit_array_capacity(const struct spdk_bit_array *ba) 
}



static inline int

_spdk_bit_array_get_word(const struct spdk_bit_array *ba, uint32_t bit_index,

bit_array_get_word(const struct spdk_bit_array *ba, uint32_t bit_index,

		   uint32_t *word_index, uint32_t *word_bit_index)

{

	if (spdk_unlikely(bit_index >= ba->bit_count)) {
@@ -179,7 +179,7 @@ spdk_bit_array_get(const struct spdk_bit_array *ba, uint32_t bit_index) 
{

	uint32_t word_index, word_bit_index;



	if (_spdk_bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

	if (bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

		return false;

	}
@@ -191,7 +191,7 @@ spdk_bit_array_set(struct spdk_bit_array *ba, uint32_t bit_index) 
{

	uint32_t word_index, word_bit_index;



	if (_spdk_bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

	if (bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

		return -EINVAL;

	}
@@ -204,7 +204,7 @@ spdk_bit_array_clear(struct spdk_bit_array *ba, uint32_t bit_index) 
{

	uint32_t word_index, word_bit_index;



	if (_spdk_bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

	if (bit_array_get_word(ba, bit_index, &word_index, &word_bit_index)) {

		/*

		 * Clearing past the end of the bit array is a no-op, since bit past the end

		 * are implicitly 0.
@@ -216,7 +216,7 @@ spdk_bit_array_clear(struct spdk_bit_array *ba, uint32_t bit_index) 
}



static inline uint32_t

_spdk_bit_array_find_first(const struct spdk_bit_array *ba, uint32_t start_bit_index,

bit_array_find_first(const struct spdk_bit_array *ba, uint32_t start_bit_index,

		     spdk_bit_array_word xor_mask)

{

	uint32_t word_index, first_word_bit_index;
@@ -257,7 +257,7 @@ spdk_bit_array_find_first_set(const struct spdk_bit_array *ba, uint32_t start_bi 
{

	uint32_t bit_index;



	bit_index = _spdk_bit_array_find_first(ba, start_bit_index, 0);

	bit_index = bit_array_find_first(ba, start_bit_index, 0);



	/*

	 * If we ran off the end of the array and found the 1 bit in the extra word,
@@ -275,7 +275,7 @@ spdk_bit_array_find_first_clear(const struct spdk_bit_array *ba, uint32_t start_ 
{

	uint32_t bit_index;



	bit_index = _spdk_bit_array_find_first(ba, start_bit_index, SPDK_BIT_ARRAY_WORD_C(-1));

	bit_index = bit_array_find_first(ba, start_bit_index, SPDK_BIT_ARRAY_WORD_C(-1));



	/*

	 * If we ran off the end of the array and found the 0 bit in the extra word,