Commit a73d4a05 authored by Thorsten Blum's avatar Thorsten Blum Committed by Juergen Gross
Browse files

drivers/xen/xenbus: Replace deprecated strcpy in xenbus_transaction_end 

strcpy() is deprecated; inline the read-only string instead. Fix the
function comment and use bool instead of int while we're at it.

Link: https://github.com/KSPP/linux/issues/88


Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Message-ID: <20251031112145.103257-2-thorsten.blum@linux.dev>
parent 6fec913f

drivers/xen/xenbus/xenbus_xs.c

+4 −10
Original line number Diff line number Diff line
@@ -546,18 +546,12 @@ int xenbus_transaction_start(struct xenbus_transaction *t) 
EXPORT_SYMBOL_GPL(xenbus_transaction_start);



/* End a transaction.

 * If abandon is true, transaction is discarded instead of committed.

 * If abort is true, transaction is discarded instead of committed.

 */

int xenbus_transaction_end(struct xenbus_transaction t, int abort)

int xenbus_transaction_end(struct xenbus_transaction t, bool abort)

{

	char abortstr[2];



	if (abort)

		strcpy(abortstr, "F");

	else

		strcpy(abortstr, "T");



	return xs_error(xs_single(t, XS_TRANSACTION_END, abortstr, NULL));

	return xs_error(xs_single(t, XS_TRANSACTION_END, abort ? "F" : "T",

				  NULL));

}

EXPORT_SYMBOL_GPL(xenbus_transaction_end);

include/xen/xenbus.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int xenbus_exists(struct xenbus_transaction t, 
		  const char *dir, const char *node);

int xenbus_rm(struct xenbus_transaction t, const char *dir, const char *node);

int xenbus_transaction_start(struct xenbus_transaction *t);

int xenbus_transaction_end(struct xenbus_transaction t, int abort);

int xenbus_transaction_end(struct xenbus_transaction t, bool abort);



/* Single read and scanf: returns -errno or num scanned if > 0. */

__scanf(4, 5)