Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5338c169 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

[media] pvrusb2: Replace memcpy with struct assignment 

This kind of memcpy() is error-prone. Its replacement with a struct
assignment is prefered because it's type-safe and much easier to read.
Found by coccinelle. Hand patched and reviewed.
Tested by compilation only.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)
// <smpl>
@@
identifier struct_name;
struct struct_name to;
struct struct_name from;
expression E;
@@
-memcpy(&(to), &(from), E);
+to = from;
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5c2edefe

drivers/media/usb/pvrusb2/pvrusb2-encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -422,8 +422,7 @@ int pvr2_encoder_adjust(struct pvr2_hdw *hdw) 
		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "Error from cx2341x module code=%d",ret);

	} else {

		memcpy(&hdw->enc_cur_state,&hdw->enc_ctl_state,

		       sizeof(struct cx2341x_mpeg_params));

		hdw->enc_cur_state = hdw->enc_ctl_state;

		hdw->enc_cur_valid = !0;

	}

	return ret;

drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c

+2 −2
Original line number Diff line number Diff line
@@ -649,8 +649,8 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw) 
	}



	// Configure the adapter and set up everything else related to it.

	memcpy(&hdw->i2c_adap,&pvr2_i2c_adap_template,sizeof(hdw->i2c_adap));

	memcpy(&hdw->i2c_algo,&pvr2_i2c_algo_template,sizeof(hdw->i2c_algo));

	hdw->i2c_adap = pvr2_i2c_adap_template;

	hdw->i2c_algo = pvr2_i2c_algo_template;

	strlcpy(hdw->i2c_adap.name,hdw->name,sizeof(hdw->i2c_adap.name));

	hdw->i2c_adap.dev.parent = &hdw->usb_dev->dev;

	hdw->i2c_adap.algo = &hdw->i2c_algo;

drivers/media/usb/pvrusb2/pvrusb2-v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, 
		return;

	}



	memcpy(&dip->devbase,&vdev_template,sizeof(vdev_template));

	dip->devbase = vdev_template;

	dip->devbase.release = pvr2_video_device_release;

	dip->devbase.ioctl_ops = &pvr2_ioctl_ops;

	{