[2571] in BarnOwl Developers
Re: [PATCH] Properly revert globalnotifier changes to stubgen.pl
daemon@ATHENA.MIT.EDU (Nelson Elhage)
Mon Aug 2 20:55:18 2010
From: Nelson Elhage <nelhage@MIT.EDU>
To: David Benjamin <davidben@mit.edu>, barnowl-dev@mit.edu
In-Reply-To: <1280766103-2891-1-git-send-email-davidben@mit.edu>
Date: Mon, 02 Aug 2010 20:55:10 -0400
lgtm
On Mon, 2 Aug 2010 09:21:43 -0700, David Benjamin <davidben@MIT.EDU> wrote:
> Apparently I made some typoes and didn't do the obvious thing of
> checking out the old copy when punting the experiment. Variables with
> different varname and altvarname got slightly confused.
> ---
> stubgen.pl | 44 ++++++++++++++------------------------------
> 1 files changed, 14 insertions(+), 30 deletions(-)
>
> diff --git a/stubgen.pl b/stubgen.pl
> index c2644ab..33dafec 100755
> --- a/stubgen.pl
> +++ b/stubgen.pl
> @@ -11,39 +11,23 @@ foreach $file (@ARGV) {
> my $varname = $2;
> my $altvarname = $2;
> $altvarname = $3 if ($3);
> - my $detailname = $altvarname;
> - $detailname =~ s/[^a-zA-Z0-9]/-/g;
> - $detailname =~ s/^[^a-zA-Z]+//;
> if ($vartype =~ /^BOOL/) {
> - print <<EOT;
> -void owl_global_set_${altvarname}_on(owl_global *g) {
> - owl_variable_set_bool_on(&g->vars, "$altvarname");
> -}
> -void owl_global_set_${altvarname}_off(owl_global *g) {
> - owl_variable_set_bool_off(&g->vars, "$altvarname");
> -}
> -int owl_global_is_$altvarname(const owl_global *g) {
> - return owl_variable_get_bool(&g->vars, "$varname");
> -}
> -EOT
> + print "void owl_global_set_${altvarname}_on(owl_global *g) {\n";
> + print " owl_variable_set_bool_on(&g->vars, \"$varname\");\n}\n";
> + print "void owl_global_set_${altvarname}_off(owl_global *g) {\n";
> + print " owl_variable_set_bool_off(&g->vars, \"$varname\");\n}\n";
> + print "int owl_global_is_$altvarname(const owl_global *g) {\n";
> + print " return owl_variable_get_bool(&g->vars, \"$varname\");\n}\n";
> } elsif ($vartype =~ /^PATH/ or $vartype =~ /^STRING/) {
> - print <<EOT;
> -void owl_global_set_${altvarname}(owl_global *g, const char *text) {
> - owl_variable_set_string(&g->vars, "$altvarname", text);
> -}
> -const char *owl_global_get_$altvarname(const owl_global *g) {
> - return owl_variable_get_string(&g->vars, "$varname");
> -}
> -EOT
> + print "void owl_global_set_$altvarname(owl_global *g, const char *text) {\n";
> + print " owl_variable_set_string(&g->vars, \"$varname\", text);\n}\n";
> + print "const char *owl_global_get_$altvarname(const owl_global *g) {\n";
> + print " return owl_variable_get_string(&g->vars, \"$varname\");\n}\n";
> } elsif ($vartype =~ /^INT/ or $vartype =~ /^ENUM/) {
> - print <<EOT;
> -void owl_global_set_${altvarname}(owl_global *g, int n) {
> - owl_variable_set_int(&g->vars, "$altvarname", n);
> -}
> -int owl_global_get_$altvarname(const owl_global *g) {
> - return owl_variable_get_int(&g->vars, "$varname");
> -}
> -EOT
> + print "void owl_global_set_$altvarname(owl_global *g, int n) {\n";
> + print " owl_variable_set_int(&g->vars, \"$varname\", n);\n}\n";
> + print "int owl_global_get_$altvarname(const owl_global *g) {\n";
> + print " return owl_variable_get_int(&g->vars, \"$varname\");\n}\n";
> }
> }
> }
> --
> 1.7.2.1.7.gf50fd
>
>
