Changeset 8203afd for perlconfig.c

Timestamp:

Jan 9, 2007, 11:33:44 PM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

d609dd6

Parents:

ffe70f9

git-author:

Nelson Elhage <nelhage@mit.edu> (01/09/07 18:50:40)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/09/07 23:33:44)

Message:

* Renaming package owl to BarnOwl::
* Moving hooks into the BarnOwl::Hooks package, and restoring support
  for .owlconf files that use sub startup {} and so on.

File:

• perlconfig.c (modified) (8 diffs)

perlconfig.c

@@ -12 +12 @@
 extern char *owl_perlwrap_codebuff;
 
-extern XS(boot_owl);
+extern XS(boot_BarnOwl);
 extern XS(boot_DynaLoader);
 // extern XS(boot_DBI);
@@ -21 +21 @@
   dXSUB_SYS;
   {
-    newXS("owl::bootstrap", boot_owl, file);
+    newXS("BarnOwl::bootstrap", boot_BarnOwl, file);
     newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
   }
@@ -86 +86 @@
   hv_store(h, "private", strlen("private"), newSViv(owl_message_is_private(m)),0);
 
-  if (owl_message_is_type_zephyr(m))       blessas = "owl::Message::Zephyr";
-  else if (owl_message_is_type_aim(m))     blessas = "owl::Message::AIM";
-  else if (owl_message_is_type_jabber(m))  blessas = "owl::Message::Jabber";
-  else if (owl_message_is_type_admin(m))   blessas = "owl::Message::Admin";
-  else if (owl_message_is_type_generic(m)) blessas = "owl::Message::Generic";
-  else                                     blessas = "owl::Message";
+  if (owl_message_is_type_zephyr(m))       blessas = "BarnOwl::Message::Zephyr";
+  else if (owl_message_is_type_aim(m))     blessas = "BarnOwl::Message::AIM";
+  else if (owl_message_is_type_jabber(m))  blessas = "BarnOwl::Message::Jabber";
+  else if (owl_message_is_type_admin(m))   blessas = "BarnOwl::Message::Admin";
+  else if (owl_message_is_type_generic(m)) blessas = "BarnOwl::Message::Generic";
+  else                                     blessas = "BarnOwl::Message";
 
   hr = sv_2mortal(newRV_noinc((SV*)h));
@@ -255 +255 @@
 
   /* create legacy variables */
-  perl_get_sv("owl::id", TRUE);
-  perl_get_sv("owl::class", TRUE);
-  perl_get_sv("owl::instance", TRUE);
-  perl_get_sv("owl::recipient", TRUE);
-  perl_get_sv("owl::sender", TRUE);
-  perl_get_sv("owl::realm", TRUE);
-  perl_get_sv("owl::opcode", TRUE);
-  perl_get_sv("owl::zsig", TRUE);
-  perl_get_sv("owl::msg", TRUE);
-  perl_get_sv("owl::time", TRUE);
-  perl_get_sv("owl::host", TRUE);
-  perl_get_av("owl::fields", TRUE);
+  perl_get_sv("BarnOwl::id", TRUE);
+  perl_get_sv("BarnOwl::class", TRUE);
+  perl_get_sv("BarnOwl::instance", TRUE);
+  perl_get_sv("BarnOwl::recipient", TRUE);
+  perl_get_sv("BarnOwl::sender", TRUE);
+  perl_get_sv("BarnOwl::realm", TRUE);
+  perl_get_sv("BarnOwl::opcode", TRUE);
+  perl_get_sv("BarnOwl::zsig", TRUE);
+  perl_get_sv("BarnOwl::msg", TRUE);
+  perl_get_sv("BarnOwl::time", TRUE);
+  perl_get_sv("BarnOwl::host", TRUE);
+  perl_get_av("BarnOwl::fields", TRUE);
 
   if(file) {
-    SV * cfg = get_sv("owl::configfile", TRUE);
+    SV * cfg = get_sv("BarnOwl::configfile", TRUE);
     sv_setpv(cfg, file);
   }
@@ -283 +283 @@
 
   /* check if we have the formatting function */
-  if (owl_perlconfig_is_function("owl::format_msg")) {
+  if (owl_perlconfig_is_function("BarnOwl::format_msg")) {
     owl_global_set_config_format(&g, 1);
   }
@@ -361 +361 @@
     char *ret = NULL;
     ret = owl_perlconfig_call_with_message(subname?subname
-                                           :"owl::_format_msg_legacy_wrap", m);
+                                           :"BarnOwl::_format_msg_legacy_wrap", m);
     if (!ret) {
       ret = owl_sprintf("@b([Perl Message Formatting Failed!])\n");
@@ -368 +368 @@
   } else {
     char *ptr = NULL;
-    if (owl_perlconfig_is_function("owl::receive_msg")) {
+    if (owl_perlconfig_is_function("BarnOwl::Hooks::receive_msg")) {
       ptr = owl_perlconfig_call_with_message(subname?subname
-                                       :"owl::_receive_msg_legacy_wrap", m);
+                                       :"BarnOwl::_receive_msg_legacy_wrap", m);
     }
     if (ptr) owl_free(ptr);
@@ -452 +452 @@
 void owl_perlconfig_mainloop()
 {
+  if (!owl_perlconfig_is_function("BarnOwl::Hooks::mainloop_hook"))
+    return;
   dSP ;
   PUSHMARK(SP) ;
-  call_pv("owl::mainloop_hook", G_DISCARD|G_EVAL);
+  call_pv("BarnOwl::Hooks::mainloop_hook", G_DISCARD|G_EVAL);
   if(SvTRUE(ERRSV)) {
     STRLEN n_a;