From 26fda7a3196c78a1ed1c0e7e9fb8c25a9f2a337e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 11 Dec 2013 14:03:12 -0800 Subject: [PATCH] space-before-tab whitespace cleanup Remove space before tab characters. Found by git grep ' ' (Space, Ctrl-V, Tab in shell). Signed-off-by: Kir Kolyshkin Signed-off-by: Pavel Emelyanov --- arch/arm/include/asm/restore.h | 4 ++-- arch/arm/include/asm/restorer.h | 18 +++++++++--------- arch/x86/include/asm/restore.h | 4 ++-- cr-show.c | 2 +- files-reg.c | 2 +- include/restorer.h | 6 +++--- include/sockets.h | 4 ++-- pie/Makefile | 2 +- pie/restorer.c | 2 +- protobuf/Makefile | 12 ++++++------ protobuf/core-x86.proto | 4 ++-- protobuf/timer.proto | 4 ++-- scripts/Makefile.version | 2 +- test/app-emu/lxc/run.sh | 2 +- test/zdtm/lib/zdtmtst.h | 2 +- test/zdtm/live/static/fpu00.c | 2 +- test/zdtm/live/static/maps00.c | 2 +- test/zdtm/live/transition/Makefile | 4 ++-- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/arch/arm/include/asm/restore.h b/arch/arm/include/asm/restore.h index 675cae307..1d6a423ff 100644 --- a/arch/arm/include/asm/restore.h +++ b/arch/arm/include/asm/restore.h @@ -5,13 +5,13 @@ #include "protobuf/core.pb-c.h" -#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ +#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ task_args) \ asm volatile( \ "mov %%sp, %%%0 \n" \ "mov %%r1, %%%1 \n" \ "mov %%r0, %%%2 \n" \ - "bx %%r1 \n" \ + "bx %%r1 \n" \ : \ : "r"(new_sp), \ "r"(restore_task_exec_start), \ diff --git a/arch/arm/include/asm/restorer.h b/arch/arm/include/asm/restorer.h index 181744da3..7ffb05cc4 100644 --- a/arch/arm/include/asm/restorer.h +++ b/arch/arm/include/asm/restorer.h @@ -76,32 +76,32 @@ struct rt_sigframe { : "r"(new_sp) \ : "sp","memory") -#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \ +#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \ thread_args, clone_restore_fn) \ asm volatile( \ "clone_emul: \n" \ "ldr %%r1, %2 \n" \ - "sub %%r1, #16 \n" \ + "sub %%r1, #16 \n" \ "mov %%r0, %%%6 \n" \ "str %%r0, [%%r1, #4] \n" \ "mov %%r0, %%%5 \n" \ - "str %%r0, [%%r1] \n" \ + "str %%r0, [%%r1] \n" \ "mov %%r0, %%%1 \n" \ "mov %%r2, %%%3 \n" \ "mov %%r3, %%%4 \n" \ "mov %%r7, #"__stringify(__NR_clone)" \n" \ - "svc #0 \n" \ + "svc #0 \n" \ \ - "cmp %%r0, #0 \n" \ + "cmp %%r0, #0 \n" \ "beq thread_run \n" \ \ "mov %%%0, %%r0 \n" \ "b clone_end \n" \ \ "thread_run: \n" \ - "pop { %%r1 } \n" \ - "pop { %%r0 } \n" \ - "bx %%r1 \n" \ + "pop { %%r1 } \n" \ + "pop { %%r0 } \n" \ + "bx %%r1 \n" \ \ "clone_end: \n" \ : "=r"(ret) \ @@ -117,7 +117,7 @@ struct rt_sigframe { asm volatile( \ "mov %%sp, %0 \n" \ "mov %%r0, #0 \n" \ - "bx %%r0 \n" \ + "bx %%r0 \n" \ : \ : "r"(ret) \ : "memory") diff --git a/arch/x86/include/asm/restore.h b/arch/x86/include/asm/restore.h index 8ad9c03c2..7c39e0060 100644 --- a/arch/x86/include/asm/restore.h +++ b/arch/x86/include/asm/restore.h @@ -5,13 +5,13 @@ #include "protobuf/core.pb-c.h" -#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ +#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ task_args) \ asm volatile( \ "movq %0, %%rbx \n" \ "movq %1, %%rax \n" \ "movq %2, %%rdi \n" \ - "movq %%rbx, %%rsp \n" \ + "movq %%rbx, %%rsp \n" \ "callq *%%rax \n" \ : \ : "g"(new_sp), \ diff --git a/cr-show.c b/cr-show.c index 21695f9d6..df564a58e 100644 --- a/cr-show.c +++ b/cr-show.c @@ -328,7 +328,7 @@ static struct show_image_info show_infos[] = { { PACKETSK_MAGIC, PB_PACKET_SOCK, false, NULL, "5:%d", }, { ITIMERS_MAGIC, PB_ITIMER, false, NULL, "*:%Lu", }, { POSIX_TIMERS_MAGIC, PB_POSIX_TIMER, false, NULL, "*:%d 5:%Lu 7:%Lu 8:%lu 9:%Lu 10:%Lu", }, - { NETDEV_MAGIC, PB_NETDEV, false, NULL, "2:%d", }, + { NETDEV_MAGIC, PB_NETDEV, false, NULL, "2:%d", }, { PAGEMAP_MAGIC, PB_PAGEMAP_HEAD, true, show_pagemaps, NULL, }, { PIPES_DATA_MAGIC, PB_PIPE_DATA, false, pipe_data_handler, NULL, }, diff --git a/files-reg.c b/files-reg.c index f74c79248..181f1f202 100644 --- a/files-reg.c +++ b/files-reg.c @@ -371,7 +371,7 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp) tmp--; } - rfe.id = *idp = fd_id_generate_special(); + rfe.id = *idp = fd_id_generate_special(); rfe.flags = 0; rfe.pos = 0; rfe.fown = &fwn; diff --git a/include/restorer.h b/include/restorer.h index f7f31e1e2..c9ddbef72 100644 --- a/include/restorer.h +++ b/include/restorer.h @@ -74,7 +74,7 @@ struct thread_restore_args { struct restore_mem_zone mem_zone; int pid; - UserRegsEntry gpregs; + UserRegsEntry gpregs; u64 clear_tid_addr; bool has_futex; @@ -122,8 +122,8 @@ struct task_restore_args { struct itimerval itimers[3]; - int timer_n; - struct restore_posix_timer *posix_timers; + int timer_n; + struct restore_posix_timer *posix_timers; CredsEntry creds; uint32_t cap_inh[CR_CAP_SIZE]; diff --git a/include/sockets.h b/include/sockets.h index b11cdeeca..34ae0acc9 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -63,10 +63,10 @@ extern int do_restore_opt(int sk, int level, int name, void *val, int len); #define restore_opt(s, l, n, f) do_restore_opt(s, l, n, f, sizeof(*f)) #define sk_encode_shutdown(img, mask) do { \ - /* \ + /* \ * protobuf SK_SHUTDOWN__ bits match those \ * reported by kernel \ - */ \ + */ \ (img)->shutdown = mask; \ if ((img)->shutdown != SK_SHUTDOWN__NONE) \ (img)->has_shutdown = true; \ diff --git a/pie/Makefile b/pie/Makefile index ed0767980..b1099fddd 100644 --- a/pie/Makefile +++ b/pie/Makefile @@ -1,5 +1,5 @@ targets += parasite -targets += restorer +targets += restorer obj-y += log-simple.o obj-y += util.o diff --git a/pie/restorer.c b/pie/restorer.c index 96f49f8e2..2bfe70d76 100644 --- a/pie/restorer.c +++ b/pie/restorer.c @@ -36,7 +36,7 @@ #define sys_prctl_safe(opcode, val1, val2, val3) \ ({ \ long __ret = sys_prctl(opcode, val1, val2, val3, 0); \ - if (__ret) \ + if (__ret) \ pr_err("prctl failed @%d with %ld\n", __LINE__, __ret);\ __ret; \ }) diff --git a/protobuf/Makefile b/protobuf/Makefile index 60e1919ec..128f7e58f 100644 --- a/protobuf/Makefile +++ b/protobuf/Makefile @@ -66,18 +66,18 @@ proto-h := $(proto-obj-y:.o=.pb-c.h) $(obj)/%.proto.d: $(obj)/%.proto $(E) " PB DDEP " $@ - $(Q) grep "^[[:blank:]]*import[[:blank:]]" $^ | sed \ - -e 's/[[:blank:]]*import[[:blank:]]*//' \ + $(Q) grep "^[[:blank:]]*import[[:blank:]]" $^ | sed \ + -e 's/[[:blank:]]*import[[:blank:]]*//' \ -e 's/[\";]//g' \ -e 's/.*/$(subst /,\/,$^):$(subst /,\/,$(obj))\/&/' | \ uniq > $@ $(obj)/%.proto.c.d: $(obj)/%.proto | $(obj)/%.proto.d $(E) " PB DEP " $@ - $(Q) grep "^[[:blank:]]*import[[:blank:]]" $< | sed \ - -e 's/[[:blank:]]*import[[:blank:]]*//' \ - -e 's/.proto/.pb-c.c/' \ - -e 's/[\";]//g' \ + $(Q) grep "^[[:blank:]]*import[[:blank:]]" $< | sed \ + -e 's/[[:blank:]]*import[[:blank:]]*//' \ + -e 's/.proto/.pb-c.c/' \ + -e 's/[\";]//g' \ -e 's/.*/$(subst .proto,.pb-c.c,$(subst /,\/,$<)):$(subst /,\/,$(obj))\/&/' | \ uniq > $@ diff --git a/protobuf/core-x86.proto b/protobuf/core-x86.proto index ca737349b..b6eb0b338 100644 --- a/protobuf/core-x86.proto +++ b/protobuf/core-x86.proto @@ -14,8 +14,8 @@ message user_x86_regs_entry { required uint64 dx = 13; required uint64 si = 14; required uint64 di = 15; - required uint64 orig_ax = 16; - required uint64 ip = 17; + required uint64 orig_ax = 16; + required uint64 ip = 17; required uint64 cs = 18; required uint64 flags = 19; required uint64 sp = 20; diff --git a/protobuf/timer.proto b/protobuf/timer.proto index f7ac3d364..d11f7ef2d 100644 --- a/protobuf/timer.proto +++ b/protobuf/timer.proto @@ -6,9 +6,9 @@ message itimer_entry { } message posix_timer_entry { - required uint32 it_id = 1; + required uint32 it_id = 1; required uint32 clock_id = 2; - required uint32 si_signo = 3; + required uint32 si_signo = 3; required uint32 it_sigev_notify = 4; required uint64 sival_ptr = 5; required uint32 overrun = 6; diff --git a/scripts/Makefile.version b/scripts/Makefile.version index 3149299db..6aecb0ba9 100644 --- a/scripts/Makefile.version +++ b/scripts/Makefile.version @@ -8,7 +8,7 @@ endif $(VERSION_HEADER): Makefile scripts/Makefile.version $(E) " GEN " $@ - $(Q) echo "/* Autogenerated, do not edit */" > $(VERSION_HEADER) + $(Q) echo "/* Autogenerated, do not edit */" > $(VERSION_HEADER) $(Q) echo "#ifndef __CR_VERSION_H__" >> $(VERSION_HEADER) $(Q) echo "#define __CR_VERSION_H__" >> $(VERSION_HEADER) $(Q) echo "#define CRIU_VERSION \"$(CRTOOLSVERSION)\"" >> $(VERSION_HEADER) diff --git a/test/app-emu/lxc/run.sh b/test/app-emu/lxc/run.sh index 3664f5f8d..b6c700a21 100755 --- a/test/app-emu/lxc/run.sh +++ b/test/app-emu/lxc/run.sh @@ -46,7 +46,7 @@ echo Press Enter for restoring CT read echo "Restore the CT $name" -${criu} restore --evasive-devices \ +${criu} restore --evasive-devices \ --tcp-established \ --file-locks \ -n net -n mnt -n ipc -n pid \ diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h index b538eab03..e465e26f3 100644 --- a/test/zdtm/lib/zdtmtst.h +++ b/test/zdtm/lib/zdtmtst.h @@ -61,7 +61,7 @@ struct long_opt { extern void __push_opt(struct long_opt *opt); -#define TEST_OPTION(name, type, doc, is_required) \ +#define TEST_OPTION(name, type, doc, is_required) \ param_check_##type(name, &(name)); \ static struct long_opt __long_opt_##name = { \ #name, #type, doc, is_required, parse_opt_##type, &name }; \ diff --git a/test/zdtm/live/static/fpu00.c b/test/zdtm/live/static/fpu00.c index 1a1ba4097..f04fac4f2 100644 --- a/test/zdtm/live/static/fpu00.c +++ b/test/zdtm/live/static/fpu00.c @@ -65,7 +65,7 @@ int main(int argc, char ** argv) start(a, b, c, d); - res1 = finish(); + res1 = finish(); start(a, b, c, d); diff --git a/test/zdtm/live/static/maps00.c b/test/zdtm/live/static/maps00.c index 35b55a719..175a86785 100644 --- a/test/zdtm/live/static/maps00.c +++ b/test/zdtm/live/static/maps00.c @@ -146,7 +146,7 @@ static int check_map(struct map *map) map->ptr, map->flag, map->prot); return -1; } - /* prot |= PROT_READ// need barrier before this line, + /* prot |= PROT_READ// need barrier before this line, because compiler change order commands. I finded one method: look at next lines*/ } else diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile index ea6568b33..c03a083d4 100644 --- a/test/zdtm/live/transition/Makefile +++ b/test/zdtm/live/transition/Makefile @@ -6,14 +6,14 @@ override CPPFLAGS += -I$(LIBDIR) CFLAGS = -g -O2 -Wall -Werror TST_NOFILE = \ - ipc \ + ipc \ ptrace \ epoll \ fork \ fork2 \ TST_FILE = \ - file_read \ + file_read \ TST = $(TST_NOFILE) $(TST_FILE) SRC = $(TST:%=%.c)