Commit 856388d8 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

util: make has_prefix optional in spdk_parse_capacity() 



Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Iaec9713941674418bf01764d5641130b031f5174
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20578


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 7fba5433

include/spdk/string.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int spdk_parse_ip_addr(char *ip, char **host, char **port); 
 * \param cap_str Null terminated string.

 * \param cap Pointer where the parsed capacity (in bytes) will be put.

 * \param has_prefix Pointer to a flag that will be set to describe whether given

 * string contains a binary prefix.

 * string contains a binary prefix (optional).

 *

 * \return 0 on success, or negative errno on failure.

 */

lib/util/string.c

+7 −2
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ spdk_parse_capacity(const char *cap_str, uint64_t *cap, bool *has_prefix) 


	rc = sscanf(cap_str, "%"SCNu64"%c", cap, &bin_prefix);

	if (rc == 1) {

		if (has_prefix != NULL) {

			*has_prefix = false;

		}

		return 0;

	} else if (rc == 0) {

		if (errno == 0) {
@@ -351,7 +353,10 @@ spdk_parse_capacity(const char *cap_str, uint64_t *cap, bool *has_prefix) 
		}

	}



	if (has_prefix != NULL) {

		*has_prefix = true;

	}



	switch (bin_prefix) {

	case 'k':

	case 'K':