[Weechat-cvs] weechat/src/plugins/scripts perlweechat-perl.c ...

[kolter]

CVSROOT:        /sources/weechat
Module name:    weechat
Changes by:     kolter <kolter> 06/06/13 19:48:32

Modified files:
        src/plugins/scripts/perl: weechat-perl.c 
        src/plugins/scripts/ruby: weechat-ruby.c 

Log message:
        improve global vars uses in plugins

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/scripts/perl/weechat-perl.c?cvsroot=weechat&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/weechat/src/plugins/scripts/ruby/weechat-ruby.c?cvsroot=weechat&r1=1.32&r2=1.33

Patches:
Index: perl/weechat-perl.c
===================================================================
RCS file: /sources/weechat/weechat/src/plugins/scripts/perl/weechat-perl.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- perl/weechat-perl.c 10 Jun 2006 21:34:16 -0000      1.36
+++ perl/weechat-perl.c 13 Jun 2006 19:48:32 -0000      1.37
@@ -46,11 +46,11 @@
 
 #ifndef MULTIPLICITY
 #define PKG_NAME_PREFIX "WeechatPerlPackage"
-static PerlInterpreter *main_perl = NULL;
-int packnum = 0;
+static PerlInterpreter *perl_main = NULL;
+int perl_num = 0;
 #endif
 
-char *weechat_perl_code =
+char *perl_weechat_code =
 {
 #ifndef MULTIPLICITY
     "package WeechatPerlScriptLoader;"
@@ -1443,8 +1443,8 @@
     perl_current_script = NULL;
 
 #ifndef MULTIPLICITY
-    snprintf(pkgname, sizeof(pkgname), "%s%d", PKG_NAME_PREFIX, packnum);
-    packnum++;
+    snprintf(pkgname, sizeof(pkgname), "%s%d", PKG_NAME_PREFIX, perl_num);
+    perl_num++;
     tempscript.interpreter = "WeechatPerlScriptLoader";
     eval = weechat_perl_exec (plugin, &tempscript, 
"weechat_perl_load_eval_file", filename, pkgname, "");
 #else
@@ -1464,7 +1464,7 @@
     tempscript.interpreter = (PerlInterpreter *) perl_current_interpreter;
     perl_parse (perl_current_interpreter, weechat_perl_xs_init, 3, perl_args, 
NULL);
     
-    eval_pv (weechat_perl_code, TRUE);
+    eval_pv (perl_weechat_code, TRUE);
     eval = weechat_perl_exec (plugin, &tempscript, 
"weechat_perl_load_eval_file", filename, "", "");
 
     free (perl_current_script_filename);
@@ -1785,18 +1785,18 @@
    
     plugin->print_server (plugin, "Loading Perl module \"weechat\" (without 
multiplicity)");
     
-    main_perl = perl_alloc ();
+    perl_main = perl_alloc ();
     
-    if (!main_perl)
+    if (!perl_main)
     {
         plugin->print_server (plugin,
                               "Perl error: unable to initialize Perl");
         return PLUGIN_RC_KO;
     }
     
-    perl_construct (main_perl);
-    perl_parse (main_perl, weechat_perl_xs_init, 3, perl_args, NULL);
-    eval_pv (weechat_perl_code, TRUE);
+    perl_construct (perl_main);
+    perl_parse (perl_main, weechat_perl_xs_init, 3, perl_args, NULL);
+    eval_pv (perl_weechat_code, TRUE);
 #endif
     
     plugin->cmd_handler_add (plugin, "perl",
@@ -1828,11 +1828,11 @@
 
 #ifndef MULTIPLICITY
     /* free perl intepreter */
-    if (main_perl)
+    if (perl_main)
     {
-       perl_destruct (main_perl);
-       perl_free (main_perl);
-       main_perl = NULL;
+       perl_destruct (perl_main);
+       perl_free (perl_main);
+       perl_main = NULL;
     }
 #endif
     

Index: ruby/weechat-ruby.c
===================================================================
RCS file: /sources/weechat/weechat/src/plugins/scripts/ruby/weechat-ruby.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ruby/weechat-ruby.c 10 Jun 2006 21:34:16 -0000      1.32
+++ ruby/weechat-ruby.c 13 Jun 2006 19:48:32 -0000      1.33
@@ -43,10 +43,10 @@
 t_plugin_script *ruby_current_script = NULL;
 char *ruby_current_script_filename = NULL;
 
-VALUE mWeechat, mWeechatOutputs;
+VALUE ruby_mWeechat, ruby_mWeechatOutputs;
 
 #define MOD_NAME_PREFIX "WeechatRubyModule"
-int modnum = 0;
+int ruby_num = 0;
 
 typedef struct protect_call_arg {
     VALUE recv;
@@ -1581,8 +1581,8 @@
     plugin->print_server (plugin, "Loading Ruby script \"%s\"", filename);
     ruby_current_script = NULL;
 
-    snprintf(modname, sizeof(modname), "%s%d", MOD_NAME_PREFIX, modnum);
-    modnum++;
+    snprintf(modname, sizeof(modname), "%s%d", MOD_NAME_PREFIX, ruby_num);
+    ruby_num++;
 
     curModule = rb_define_module(modname);
 
@@ -1962,42 +1962,42 @@
     ruby_init_loadpath ();
     ruby_script ("__weechat_plugin__");
     
-    mWeechat = rb_define_module("Weechat");
-    rb_define_const(mWeechat, "PLUGIN_RC_OK", INT2NUM(PLUGIN_RC_OK));
-    rb_define_const(mWeechat, "PLUGIN_RC_KO", INT2NUM(PLUGIN_RC_KO));
-    rb_define_const(mWeechat, "PLUGIN_RC_OK_IGNORE_WEECHAT", 
INT2NUM(PLUGIN_RC_OK_IGNORE_WEECHAT));
-    rb_define_const(mWeechat, "PLUGIN_RC_OK_IGNORE_PLUGINS", 
INT2NUM(PLUGIN_RC_OK_IGNORE_PLUGINS));
-    rb_define_const(mWeechat, "PLUGIN_RC_OK_IGNORE_ALL", 
INT2NUM(PLUGIN_RC_OK_IGNORE_ALL));    
-    rb_define_module_function (mWeechat, "register", weechat_ruby_register, 4);
-    rb_define_module_function (mWeechat, "print", weechat_ruby_print, -1);
-    rb_define_module_function (mWeechat, "print_infobar", 
weechat_ruby_print_infobar, 2);
-    rb_define_module_function (mWeechat, "remove_infobar", 
weechat_ruby_remove_infobar, -1);
-    rb_define_module_function (mWeechat, "log", weechat_ruby_log, -1);
-    rb_define_module_function (mWeechat, "command", weechat_ruby_command, -1);
-    rb_define_module_function (mWeechat, "add_message_handler", 
weechat_ruby_add_message_handler, 2);
-    rb_define_module_function (mWeechat, "add_command_handler", 
weechat_ruby_add_command_handler, -1);
-    rb_define_module_function (mWeechat, "add_timer_handler", 
weechat_ruby_add_timer_handler, 2);
-    rb_define_module_function (mWeechat, "add_keyboard_handler", 
weechat_ruby_add_keyboard_handler, 1);
-    rb_define_module_function (mWeechat, "remove_handler", 
weechat_ruby_remove_handler, 2);
-    rb_define_module_function (mWeechat, "remove_timer_handler", 
weechat_ruby_remove_timer_handler, 1);
-    rb_define_module_function (mWeechat, "remove_keyboard_handler", 
weechat_ruby_remove_keyboard_handler, 1);
-    rb_define_module_function (mWeechat, "get_info", weechat_ruby_get_info, 
-1);
-    rb_define_module_function (mWeechat, "get_dcc_info", 
weechat_ruby_get_dcc_info, 0);
-    rb_define_module_function (mWeechat, "get_config", 
weechat_ruby_get_config, 1);
-    rb_define_module_function (mWeechat, "set_config", 
weechat_ruby_set_config, 2);
-    rb_define_module_function (mWeechat, "get_plugin_config", 
weechat_ruby_get_plugin_config, 1);
-    rb_define_module_function (mWeechat, "set_plugin_config", 
weechat_ruby_set_plugin_config, 2);
-    rb_define_module_function (mWeechat, "get_server_info", 
weechat_ruby_get_server_info, 0);
-    rb_define_module_function (mWeechat, "get_channel_info", 
weechat_ruby_get_channel_info, 1);
-    rb_define_module_function (mWeechat, "get_nick_info", 
weechat_ruby_get_nick_info, 2);
-    rb_define_module_function (mWeechat, "get_irc_color", 
weechat_ruby_get_irc_color, 1);
+    ruby_mWeechat = rb_define_module("Weechat");
+    rb_define_const(ruby_mWeechat, "PLUGIN_RC_OK", INT2NUM(PLUGIN_RC_OK));
+    rb_define_const(ruby_mWeechat, "PLUGIN_RC_KO", INT2NUM(PLUGIN_RC_KO));
+    rb_define_const(ruby_mWeechat, "PLUGIN_RC_OK_IGNORE_WEECHAT", 
INT2NUM(PLUGIN_RC_OK_IGNORE_WEECHAT));
+    rb_define_const(ruby_mWeechat, "PLUGIN_RC_OK_IGNORE_PLUGINS", 
INT2NUM(PLUGIN_RC_OK_IGNORE_PLUGINS));
+    rb_define_const(ruby_mWeechat, "PLUGIN_RC_OK_IGNORE_ALL", 
INT2NUM(PLUGIN_RC_OK_IGNORE_ALL));    
+    rb_define_module_function (ruby_mWeechat, "register", 
weechat_ruby_register, 4);
+    rb_define_module_function (ruby_mWeechat, "print", weechat_ruby_print, -1);
+    rb_define_module_function (ruby_mWeechat, "print_infobar", 
weechat_ruby_print_infobar, 2);
+    rb_define_module_function (ruby_mWeechat, "remove_infobar", 
weechat_ruby_remove_infobar, -1);
+    rb_define_module_function (ruby_mWeechat, "log", weechat_ruby_log, -1);
+    rb_define_module_function (ruby_mWeechat, "command", weechat_ruby_command, 
-1);
+    rb_define_module_function (ruby_mWeechat, "add_message_handler", 
weechat_ruby_add_message_handler, 2);
+    rb_define_module_function (ruby_mWeechat, "add_command_handler", 
weechat_ruby_add_command_handler, -1);
+    rb_define_module_function (ruby_mWeechat, "add_timer_handler", 
weechat_ruby_add_timer_handler, 2);
+    rb_define_module_function (ruby_mWeechat, "add_keyboard_handler", 
weechat_ruby_add_keyboard_handler, 1);
+    rb_define_module_function (ruby_mWeechat, "remove_handler", 
weechat_ruby_remove_handler, 2);
+    rb_define_module_function (ruby_mWeechat, "remove_timer_handler", 
weechat_ruby_remove_timer_handler, 1);
+    rb_define_module_function (ruby_mWeechat, "remove_keyboard_handler", 
weechat_ruby_remove_keyboard_handler, 1);
+    rb_define_module_function (ruby_mWeechat, "get_info", 
weechat_ruby_get_info, -1);
+    rb_define_module_function (ruby_mWeechat, "get_dcc_info", 
weechat_ruby_get_dcc_info, 0);
+    rb_define_module_function (ruby_mWeechat, "get_config", 
weechat_ruby_get_config, 1);
+    rb_define_module_function (ruby_mWeechat, "set_config", 
weechat_ruby_set_config, 2);
+    rb_define_module_function (ruby_mWeechat, "get_plugin_config", 
weechat_ruby_get_plugin_config, 1);
+    rb_define_module_function (ruby_mWeechat, "set_plugin_config", 
weechat_ruby_set_plugin_config, 2);
+    rb_define_module_function (ruby_mWeechat, "get_server_info", 
weechat_ruby_get_server_info, 0);
+    rb_define_module_function (ruby_mWeechat, "get_channel_info", 
weechat_ruby_get_channel_info, 1);
+    rb_define_module_function (ruby_mWeechat, "get_nick_info", 
weechat_ruby_get_nick_info, 2);
+    rb_define_module_function (ruby_mWeechat, "get_irc_color", 
weechat_ruby_get_irc_color, 1);
     
     /* redirect stdin and stdout */
-    mWeechatOutputs = rb_define_module("WeechatOutputs");
-    rb_define_singleton_method(mWeechatOutputs, "write", weechat_ruby_output, 
1);
-    rb_define_singleton_method(mWeechatOutputs, "puts", weechat_ruby_output, 
1);
-    rb_define_singleton_method(mWeechatOutputs, "p", weechat_ruby_output, 1);
-    rb_define_singleton_method(mWeechatOutputs, "flush", 
weechat_ruby_output_flush, 0);
+    ruby_mWeechatOutputs = rb_define_module("WeechatOutputs");
+    rb_define_singleton_method(ruby_mWeechatOutputs, "write", 
weechat_ruby_output, 1);
+    rb_define_singleton_method(ruby_mWeechatOutputs, "puts", 
weechat_ruby_output, 1);
+    rb_define_singleton_method(ruby_mWeechatOutputs, "p", weechat_ruby_output, 
1);
+    rb_define_singleton_method(ruby_mWeechatOutputs, "flush", 
weechat_ruby_output_flush, 0);
     
 
     plugin->cmd_handler_add (plugin, "ruby",