Commit 71db3a08 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

util: make spdk_strerror_r() return void 



Handle the possibility of the system strerror_r() returning an error
internally within spdk_strerror_r() so that callers don't need to check
the return value.

Change-Id: I0571c3f5999873575562d08a04d714716a7881ff
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/393105


Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 2f700bd9

include/spdk/string.h

+1 −3
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ char *spdk_str_trim(char *s); 
 * \param errnum Error code

 * \param buf Pointer to a buffer in which to place the error message

 * \param buflen the size of the buffer in bytes

 *

 * \return 0 upon success, a positive error number or -1 upon failure.

 */

int spdk_strerror_r(int errnum, char *buf, size_t buflen);

void spdk_strerror_r(int errnum, char *buf, size_t buflen);



/**

 * Remove trailing newlines from the end of a string in place.

lib/util/string.c

+11 −4
Original line number Diff line number Diff line
@@ -327,20 +327,27 @@ spdk_str_chomp(char *s) 
	return removed;

}



int

void

spdk_strerror_r(int errnum, char *buf, size_t buflen)

{

	int rc;



#if defined(__USE_GNU)

	char *new_buffer;

	new_buffer = strerror_r(errnum, buf, buflen);

	if (new_buffer != NULL) {

		snprintf(buf, buflen, "%s", new_buffer);

		return 0;

		rc = 0;

	} else {

		rc = 1;

	}

	return 0;

#else

	return strerror_r(errnum, buf, buflen);

	rc = strerror_r(errnum, buf, buflen);

#endif



	if (rc != 0) {

		snprintf(buf, buflen, "Unknown error %d", errnum);

	}

}



int