remote generator: Replace tabs with spaces and rename file

No functional change included, just a whitespace change.

daemon/Makefile.am

@@ -23,7 +23,7 @@ AVAHI_SOURCES =						\
 
 DISTCLEANFILES =
 EXTRA_DIST =						\
-	remote_generate_stubs.pl			\
+	remote_generator.pl				\
 	libvirtd.conf					\
 	libvirtd.init.in				\
 	libvirtd.upstart				\
@@ -216,29 +216,29 @@ remote.h: \
 REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
 QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
 
-remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -p remote $(REMOTE_PROTOCOL) > $@
+remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote $(REMOTE_PROTOCOL) > $@
 
-remote_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -t remote $(REMOTE_PROTOCOL) > $@
+remote_dispatch_table.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote $(REMOTE_PROTOCOL) > $@
 
-remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -a remote $(REMOTE_PROTOCOL) > $@
+remote_dispatch_args.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote $(REMOTE_PROTOCOL) > $@
 
-remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -c -r remote $(REMOTE_PROTOCOL) > $@
+remote_dispatch_ret.h: $(srcdir)/remote_generator.pl $(REMOTE_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote $(REMOTE_PROTOCOL) > $@
 
-qemu_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -p qemu $(QEMU_PROTOCOL) > $@
+qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu $(QEMU_PROTOCOL) > $@
 
-qemu_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -t qemu $(QEMU_PROTOCOL) > $@
+qemu_dispatch_table.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu $(QEMU_PROTOCOL) > $@
 
-qemu_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -a qemu $(QEMU_PROTOCOL) > $@
+qemu_dispatch_args.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu $(QEMU_PROTOCOL) > $@
 
-qemu_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(QEMU_PROTOCOL)
-	$(AM_V_GEN)perl -w $(srcdir)/remote_generate_stubs.pl -r qemu $(QEMU_PROTOCOL) > $@
+qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl $(QEMU_PROTOCOL)
+	$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu $(QEMU_PROTOCOL) > $@
 
 LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
                   libvirtd.uml.logrotate libvirtd.logrotate

daemon/qemu_dispatch_args.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/qemu_dispatch_prototypes.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/qemu_dispatch_ret.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/qemu_dispatch_table.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/remote_dispatch_args.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/remote_dispatch_prototypes.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/remote_dispatch_ret.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/remote_dispatch_table.h

-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 

daemon/remote_generate_stubs.pl → daemon/remote_generator.pl

@@ -9,8 +9,8 @@
 # for both remote_protocol.x and qemu_protocol.x, you would run the
 # following:
 #
-# remote_generate_stubs.pl -c -t remote ../src/remote/remote_protocol.x
-# remote_generate_stubs.pl -t qemu ../src/remote/qemu_protocol.x
+# remote_generator.pl -c -t remote ../src/remote/remote_protocol.x
+# remote_generator.pl -t qemu ../src/remote/qemu_protocol.x
 #
 # By Richard Jones <rjones@redhat.com>
 
@@ -42,61 +42,61 @@ my ($name, $ProcName, $id, %calls, @calls);
 if ($opt_c) {
     # REMOTE_PROC_CLOSE has no args or ret.
     $calls{close} = {
-	name => "close",
-	ProcName => "Close",
-	UC_NAME => "CLOSE",
-	args => "void",
-	ret => "void",
+        name => "close",
+        ProcName => "Close",
+        UC_NAME => "CLOSE",
+        args => "void",
+        ret => "void",
     };
 }
 
 while (<>) {
     if (/^struct ${structprefix}_(.*)_args/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
+        $name = $1;
+        $ProcName = name_to_ProcName ($name);
 
-	die "duplicate definition of ${structprefix}_${name}_args"
-	    if exists $calls{$name};
+        die "duplicate definition of ${structprefix}_${name}_args"
+            if exists $calls{$name};
 
-	$calls{$name} = {
-	    name => $name,
-	    ProcName => $ProcName,
-	    UC_NAME => uc $name,
-	    args => "${structprefix}_${name}_args",
-	    ret => "void",
-	};
+        $calls{$name} = {
+            name => $name,
+            ProcName => $ProcName,
+            UC_NAME => uc $name,
+            args => "${structprefix}_${name}_args",
+            ret => "void",
+        };
 
     } elsif (/^struct ${structprefix}_(.*)_ret/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
-
-	if (exists $calls{$name}) {
-	    $calls{$name}->{ret} = "${structprefix}_${name}_ret";
-	} else {
-	    $calls{$name} = {
-		name => $name,
-		ProcName => $ProcName,
-		UC_NAME => uc $name,
-		args => "void",
-		ret => "${structprefix}_${name}_ret"
-	    }
-	}
+        $name = $1;
+        $ProcName = name_to_ProcName ($name);
+
+        if (exists $calls{$name}) {
+            $calls{$name}->{ret} = "${structprefix}_${name}_ret";
+        } else {
+            $calls{$name} = {
+                name => $name,
+                ProcName => $ProcName,
+                UC_NAME => uc $name,
+                args => "void",
+                ret => "${structprefix}_${name}_ret"
+            }
+        }
     } elsif (/^struct ${structprefix}_(.*)_msg/) {
-	$name = $1;
-	$ProcName = name_to_ProcName ($name);
-
-	$calls{$name} = {
-	    name => $name,
-	    ProcName => $ProcName,
-	    UC_NAME => uc $name,
-	    msg => "${structprefix}_${name}_msg"
-	}
+        $name = $1;
+        $ProcName = name_to_ProcName ($name);
+
+        $calls{$name} = {
+            name => $name,
+            ProcName => $ProcName,
+            UC_NAME => uc $name,
+            msg => "${structprefix}_${name}_msg"
+        }
     } elsif (/^\s*${procprefix}_PROC_(.*?)\s+=\s+(\d+),?$/) {
-	$name = lc $1;
-	$id = $2;
-	$ProcName = name_to_ProcName ($name);
+        $name = lc $1;
+        $id = $2;
+        $ProcName = name_to_ProcName ($name);
 
-	$calls[$id] = $calls{$name};
+        $calls[$id] = $calls{$name};
     }
 }
 
@@ -104,7 +104,7 @@ while (<>) {
 # Output
 
 print <<__EOF__;
-/* Automatically generated by remote_generate_stubs.pl.
+/* Automatically generated by remote_generator.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 
@@ -114,9 +114,9 @@ __EOF__
 if ($opt_d) {
     my @keys = sort (keys %calls);
     foreach (@keys) {
-	print "$_:\n";
-	print "        name $calls{$_}->{name} ($calls{$_}->{ProcName})\n";
-	print "        $calls{$_}->{args} -> $calls{$_}->{ret}\n";
+        print "$_:\n";
+        print "        name $calls{$_}->{name} ($calls{$_}->{ProcName})\n";
+        print "        $calls{$_}->{args} -> $calls{$_}->{ret}\n";
     }
 }
 
@@ -124,17 +124,17 @@ if ($opt_d) {
 elsif ($opt_p) {
     my @keys = sort (keys %calls);
     foreach (@keys) {
-	# Skip things which are REMOTE_MESSAGE
-	next if $calls{$_}->{msg};
-
-	print "static int ${structprefix}Dispatch$calls{$_}->{ProcName}(\n";
-	print "    struct qemud_server *server,\n";
-	print "    struct qemud_client *client,\n";
-	print "    virConnectPtr conn,\n";
-	print "    remote_message_header *hdr,\n";
-	print "    remote_error *rerr,\n";
-	print "    $calls{$_}->{args} *args,\n";
-	print "    $calls{$_}->{ret} *ret);\n";
+        # Skip things which are REMOTE_MESSAGE
+        next if $calls{$_}->{msg};
+
+        print "static int ${structprefix}Dispatch$calls{$_}->{ProcName}(\n";
+        print "    struct qemud_server *server,\n";
+        print "    struct qemud_client *client,\n";
+        print "    virConnectPtr conn,\n";
+        print "    remote_message_header *hdr,\n";
+        print "    remote_error *rerr,\n";
+        print "    $calls{$_}->{args} *args,\n";
+        print "    $calls{$_}->{ret} *ret);\n";
     }
 }
 
@@ -142,11 +142,11 @@ elsif ($opt_p) {
 # ("remote_dispatch_args.h").
 elsif ($opt_a) {
     for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] &&
-	    !$calls[$id]->{msg} &&
-	    $calls[$id]->{args} ne "void") {
-	    print "    $calls[$id]->{args} val_$calls[$id]->{args};\n";
-	}
+        if (defined $calls[$id] &&
+            !$calls[$id]->{msg} &&
+            $calls[$id]->{args} ne "void") {
+            print "    $calls[$id]->{args} val_$calls[$id]->{args};\n";
+        }
     }
 }
 
@@ -154,11 +154,11 @@ elsif ($opt_a) {
 # ("remote_dispatch_ret.h").
 elsif ($opt_r) {
     for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] &&
-	    !$calls[$id]->{msg} &&
-	    $calls[$id]->{ret} ne "void") {
-	    print "    $calls[$id]->{ret} val_$calls[$id]->{ret};\n";
-	}
+        if (defined $calls[$id] &&
+            !$calls[$id]->{msg} &&
+            $calls[$id]->{ret} ne "void") {
+            print "    $calls[$id]->{ret} val_$calls[$id]->{ret};\n";
+        }
     }
 }
 
@@ -166,30 +166,30 @@ elsif ($opt_r) {
 # ("remote_dispatch_table.h").
 elsif ($opt_t) {
     for ($id = 0 ; $id <= $#calls ; $id++) {
-	if (defined $calls[$id] && !$calls[$id]->{msg}) {
-	    print "{   /* $calls[$id]->{ProcName} => $id */\n";
-	    print "    .fn = (dispatch_fn) ${structprefix}Dispatch$calls[$id]->{ProcName},\n";
-	    if ($calls[$id]->{args} ne "void") {
-		print "    .args_filter = (xdrproc_t) xdr_$calls[$id]->{args},\n";
-	    } else {
-		print "    .args_filter = (xdrproc_t) xdr_void,\n";
-	    }
-	    if ($calls[$id]->{ret} ne "void") {
-		print "    .ret_filter = (xdrproc_t) xdr_$calls[$id]->{ret},\n";
-	    } else {
-		print "    .ret_filter = (xdrproc_t) xdr_void,\n";
-	    }
-	    print "},\n";
-	} else {
-	    if ($calls[$id]->{msg}) {
-		print "{   /* Async event $calls[$id]->{ProcName} => $id */\n";
-	    } else {
-		print "{   /* (unused) => $id */\n";
-	    }
-	    print "    .fn = NULL,\n";
-	    print "    .args_filter = (xdrproc_t) xdr_void,\n";
-	    print "    .ret_filter = (xdrproc_t) xdr_void,\n";
-	    print "},\n";
-	}
+        if (defined $calls[$id] && !$calls[$id]->{msg}) {
+            print "{   /* $calls[$id]->{ProcName} => $id */\n";
+            print "    .fn = (dispatch_fn) ${structprefix}Dispatch$calls[$id]->{ProcName},\n";
+            if ($calls[$id]->{args} ne "void") {
+                print "    .args_filter = (xdrproc_t) xdr_$calls[$id]->{args},\n";
+            } else {
+                print "    .args_filter = (xdrproc_t) xdr_void,\n";
+            }
+            if ($calls[$id]->{ret} ne "void") {
+                print "    .ret_filter = (xdrproc_t) xdr_$calls[$id]->{ret},\n";
+            } else {
+                print "    .ret_filter = (xdrproc_t) xdr_void,\n";
+            }
+            print "},\n";
+        } else {
+            if ($calls[$id]->{msg}) {
+                print "{   /* Async event $calls[$id]->{ProcName} => $id */\n";
+            } else {
+                print "{   /* (unused) => $id */\n";
+            }
+            print "    .fn = NULL,\n";
+            print "    .args_filter = (xdrproc_t) xdr_void,\n";
+            print "    .ret_filter = (xdrproc_t) xdr_void,\n";
+            print "},\n";
+        }
     }
 }

src/remote/remote_protocol.x

@@ -367,7 +367,7 @@ struct remote_memory_param {
  * connection).  Errors are returned implicitly in the RPC protocol.
  *
  * Please follow the naming convention carefully - this file is
- * parsed by 'remote_generate_stubs.pl'.
+ * parsed by 'remote_generator.pl'.
  */
 
 struct remote_open_args {