[packages/capi4k-utils.git] / capi4k-utils-rcapid.patch

--- capi4k-utils.orig/rcapid/rcapid.c	2000-01-29 19:52:25.000000000 +0100
+++ capi4k-utils/rcapid/rcapid.c	2010-07-21 13:08:15.901331523 +0200
@@ -483,7 +483,10 @@
 	char	*p;
 
 	structure	retstruct;
-	char		retval [80];
+	union {
+		char		c [80];
+		unsigned short	s;
+	} retval;
 
 
 	log(5, "RCAPI_GET_PROFILE_REQ\n");
@@ -496,10 +499,10 @@
 	CtrlNr = get_dword(&p);
 	log(5, "\tCtrlNr: %d\n", CtrlNr);
 
-	memset(retval, 0, sizeof(retval));
-	*(unsigned short *)retval = CAPI20_GET_PROFILE(CtrlNr, retval+2); 
+	memset(&retval, 0, sizeof(retval));
+	retval.s = CAPI20_GET_PROFILE(CtrlNr, retval.c+2); 
 	retstruct.len = 66;
-	retstruct.data = retval;
+	retstruct.data = retval.c;
 
 	return(snd_message(msg, RCAPI_GET_PROFILE_CONF, &retstruct, NULL));
 }
Commit	Line	Data
b0ded9b5 KK	1	--- capi4k-utils.orig/rcapid/rcapid.c 2000-01-29 19:52:25.000000000 +0100
	2	+++ capi4k-utils/rcapid/rcapid.c 2010-07-21 13:08:15.901331523 +0200
	3	@@ -483,7 +483,10 @@
	4	char *p;
	5
	6	structure retstruct;
	7	- char retval [80];
	8	+ union {
	9	+ char c [80];
	10	+ unsigned short s;
	11	+ } retval;
	12
	13
	14	log(5, "RCAPI_GET_PROFILE_REQ\n");
	15	@@ -496,10 +499,10 @@
	16	CtrlNr = get_dword(&p);
	17	log(5, "\tCtrlNr: %d\n", CtrlNr);
	18
	19	- memset(retval, 0, sizeof(retval));
	20	- (unsigned short )retval = CAPI20_GET_PROFILE(CtrlNr, retval+2);
	21	+ memset(&retval, 0, sizeof(retval));
	22	+ retval.s = CAPI20_GET_PROFILE(CtrlNr, retval.c+2);
	23	retstruct.len = 66;
	24	- retstruct.data = retval;
	25	+ retstruct.data = retval.c;
	26
	27	return(snd_message(msg, RCAPI_GET_PROFILE_CONF, &retstruct, NULL));
	28	}