code: A little but more checkpatch fixes over code

There are more in test/ (and checkpatch.pl crashes in the middle =),
but seem to be all.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-dump.c

@@ -226,10 +226,10 @@ static int fill_fd_params(pid_t pid, int fd, int lfd, char fd_flags, struct fd_p
 		return -1;
 	}
 
-	p->fown.uid	= v[0];
-	p->fown.euid	= v[1];
-	p->fown.pid_type= owner_ex.type;
-	p->fown.pid	= owner_ex.pid;
+	p->fown.uid	 = v[0];
+	p->fown.euid	 = v[1];
+	p->fown.pid_type = owner_ex.type;
+	p->fown.pid	 = owner_ex.pid;
 
 	return 0;
 }
@@ -495,7 +495,7 @@ static int dump_task_creds(pid_t pid, const struct parasite_dump_misc *misc,
 	return pb_write_one(fdset_fd(fds, CR_FD_CREDS), &ce, PB_CREDS);
 }
 
-#define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))src.e
+#define assign_reg(dst, src, e)		do { dst->e = (__typeof__(dst->e))src.e; } while (0)
 #define assign_array(dst, src, e)	memcpy(dst->e, &src.e, sizeof(src.e))
 
 static int get_task_auxv(pid_t pid, MmEntry *mm)

cr-show.c

@@ -141,7 +141,7 @@ void print_data(unsigned long addr, unsigned char *data, size_t size)
 
 	addr_len = nice_width_for(addr + size);
 
-	for (i = 0; i < size; i+= 16) {
+	for (i = 0; i < size; i += 16) {
 		pr_msg("%#0*lx: ", addr_len, addr + i);
 		for (j = 0; j < 8; j++)
 			pr_msg("0x%02x ", data[i +  j]);

include/parasite-syscall.h

@@ -6,8 +6,8 @@
 /* parasite control block */
 struct parasite_ctl {
 	pid_t			pid;					/* process pid where we live in */
-	void *			remote_map;
-	void *			local_map;
+	void			* remote_map;
+	void			* local_map;
 	unsigned long		map_length;
 
 	unsigned long		parasite_ip;				/* service routine start ip */
@@ -17,8 +17,8 @@ struct parasite_ctl {
 
 	int			signals_blocked;
 
-	void *			addr_cmd;				/* addr for command */
-	void *			addr_args;				/* address for arguments */
+	void 			* addr_cmd;				/* addr for command */
+	void 			* addr_args;				/* address for arguments */
 	int			tsock;					/* transport socket for transfering fds */
 };
 

include/types.h

@@ -180,7 +180,7 @@ typedef struct {
 # error x86-32 bit mode not yet implemented
 #endif /* CONFIG_X86_64 */
 
-#define ASSIGN_TYPED(a,b) a = (typeof(a))b
+#define ASSIGN_TYPED(a, b) do { a = (typeof(a))b; } while (0)
 
 #ifndef PAGE_SIZE
 # define PAGE_SIZE	4096

include/util.h

@@ -263,7 +263,7 @@ int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
 
 #define KDEV_MINORBITS	20
 #define KDEV_MINORMASK	((1UL << KDEV_MINORBITS) - 1)
-#define MKKDEV(ma,mi)	(((ma) << KDEV_MINORBITS) | (mi))
+#define MKKDEV(ma, mi)	(((ma) << KDEV_MINORBITS) | (mi))
 
 static inline u32 kdev_major(u32 kdev)
 {

libnetlink.c

@@ -14,7 +14,7 @@ int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
 	while (RTA_OK(rta, len)) {
 		if ((rta->rta_type <= max) && (!tb[rta->rta_type]))
 			tb[rta->rta_type] = rta;
-		rta = RTA_NEXT(rta,len);
+		rta = RTA_NEXT(rta, len);
 	}
 	if (len)
 		pr_warn("Trimmed RTA: len %d, rta_len %d\n", len, rta->rta_len);

parasite-syscall.c

@@ -277,13 +277,13 @@ static void *mmap_seized(struct parasite_ctl *ctl,
 	void *map = NULL;
 	int ret;
 
-	regs.ax = (unsigned long)__NR_mmap;	/* mmap		*/
-	regs.di = (unsigned long)addr;		/* @addr	*/
-	regs.si = (unsigned long)length;	/* @length	*/
-	regs.dx = (unsigned long)prot;		/* @prot	*/
-	regs.r10= (unsigned long)flags;		/* @flags	*/
-	regs.r8 = (unsigned long)fd;		/* @fd		*/
-	regs.r9 = (unsigned long)offset;	/* @offset	*/
+	regs.ax  = (unsigned long)__NR_mmap;	/* mmap		*/
+	regs.di  = (unsigned long)addr;		/* @addr	*/
+	regs.si  = (unsigned long)length;	/* @length	*/
+	regs.dx  = (unsigned long)prot;		/* @prot	*/
+	regs.r10 = (unsigned long)flags;	/* @flags	*/
+	regs.r8  = (unsigned long)fd;		/* @fd		*/
+	regs.r9  = (unsigned long)offset;	/* @offset	*/
 
 	parasite_setup_regs(ctl->syscall_ip, &regs);
 

proc_parse.c

@@ -54,7 +54,7 @@ int parse_smaps(pid_t pid, struct list_head *vma_area_list, bool use_map_files)
 	struct vma_area *vma_area = NULL;
 	u64 start, end, pgoff;
 	unsigned long ino;
-	char r,w,x,s;
+	char r, w, x, s;
 	int dev_maj, dev_min;
 	int ret = -1, nr = 0;
 

restorer.c

@@ -156,7 +156,7 @@ long __export_restore_thread(struct thread_restore_args *args)
 	rt_sigframe = (void *)args->mem_zone.rt_sigframe + 8;
 
 #define CPREGT1(d)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.d
-#define CPREGT2(d,s)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.s
+#define CPREGT2(d, s)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.s
 
 	CPREGT1(r8);
 	CPREGT1(r9);
@@ -459,7 +459,7 @@ long __export_restore_task(struct task_restore_core_args *args)
 	rt_sigframe = (void *)args->mem_zone.rt_sigframe + 8;
 
 #define CPREG1(d)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.d
-#define CPREG2(d,s)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.s
+#define CPREG2(d, s)	rt_sigframe->uc.uc_mcontext.d = args->gpregs.s
 
 	CPREG1(r8);
 	CPREG1(r9);

shmem.c

@@ -223,8 +223,7 @@ int prepare_shmem_restore(void)
 	return 0;
 }
 
-struct shmem_info_dump
-{
+struct shmem_info_dump {
 	unsigned long	size;
 	unsigned long	shmid;
 	unsigned long	start;
@@ -235,7 +234,7 @@ struct shmem_info_dump
 static int nr_shmems;
 static struct shmem_info_dump *dump_shmems;
 
-static struct shmem_info_dump* shmem_find(unsigned long shmid)
+static struct shmem_info_dump *shmem_find(unsigned long shmid)
 {
 	int i;
 
@@ -285,7 +284,7 @@ int cr_dump_shmem(void)
 	for (si = dump_shmems; si < &dump_shmems[nr_shmems]; si++) {
 		pr_info("Dumping shared memory 0x%lx\n", si->shmid);
 
-		nrpages = (si->size + PAGE_SIZE -1) / PAGE_SIZE;
+		nrpages = (si->size + PAGE_SIZE - 1) / PAGE_SIZE;
 		map = xmalloc(nrpages * sizeof(*map));
 		if (!map)
 			goto err;

sk-unix.c

@@ -243,8 +243,8 @@ static int unix_collect_one(const struct unix_diag_msg *m,
 	if (!d)
 		return -1;
 
-	d->type	= m->udiag_type;
-	d->state= m->udiag_state;
+	d->type	 = m->udiag_type;
+	d->state = m->udiag_state;
 	INIT_LIST_HEAD(&d->list);
 
 	if (tb[UNIX_DIAG_PEER])