Changeset d1b1cf6 for perlconfig.c

Timestamp:

Aug 28, 2009, 12:09:07 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

ec21c62

Parents:

0571c30

git-author:

Nelson Elhage <nelhage@mit.edu> (08/26/09 23:49:26)

git-committer:

Nelson Elhage <nelhage@mit.edu> (08/28/09 00:09:07)

Message:

Set the UTF-8 flag on on strings we pass to Perl.

Add an owl_new_sv helper function that validates a string as UTF-8 and
turns it into an SV with the UTF-8 flag set, and use it everywhere in
preference to newSVpv.

File:

• perlconfig.c (modified) (11 diffs)

perlconfig.c

@@ -22 +22 @@
 }
 
+
+SV *owl_new_sv(const char * str)
+{
+  SV *ret = newSVpv(str, 0);
+  if(is_utf8_string(str, strlen(str))) {
+    SvUTF8_on(ret);
+  } else {
+    owl_function_error("Internal error! Non-UTF-8 string encountered:\n%s", str);
+  }
+  return ret;
+}
+
 SV *owl_perlconfig_message2hashref(const owl_message *m)
 {
@@ -42 +54 @@
 
 #define MSG2H(h,field) (void)hv_store(h, #field, strlen(#field),        \
-                                      newSVpv(owl_message_get_##field(m),0), 0)
+                                      owl_new_sv(owl_message_get_##field(m)), 0)
 
   if (owl_message_is_type_zephyr(m)
@@ -53 +65 @@
     for (i=0; i<j; i++) {
       ptr=owl_zephyr_get_field_as_utf8(owl_message_get_notice(m), i+1);
-      av_push(av_zfields, newSVpvn(ptr, strlen(ptr)));
+      av_push(av_zfields, owl_new_sv(ptr));
       owl_free(ptr);
     }
@@ -59 +71 @@
 
     (void)hv_store(h, "auth", strlen("auth"), 
-                   newSVpv(owl_zephyr_get_authstr(owl_message_get_notice(m)),0),0);
+                   owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))),0);
   }
 
@@ -66 +78 @@
     pair=owl_list_get_element(&(m->attributes), i);
     (void)hv_store(h, owl_pair_get_key(pair), strlen(owl_pair_get_key(pair)),
-                   newSVpv(owl_pair_get_value(pair),0),0);
+                   owl_new_sv(owl_pair_get_value(pair)),0);
   }
   
@@ -85 +97 @@
     MSG2H(h, header); 
   }
-  (void)hv_store(h, "time", strlen("time"), newSVpv(owl_message_get_timestr(m),0),0);
+  (void)hv_store(h, "time", strlen("time"), owl_new_sv(owl_message_get_timestr(m)),0);
   (void)hv_store(h, "unix_time", strlen("unix_time"), newSViv(m->time), 0);
   (void)hv_store(h, "id", strlen("id"), newSViv(owl_message_get_id(m)),0);
@@ -261 +273 @@
   XPUSHs(sv_2mortal(msgref));
   for(i=0;i<argc;i++) {
-    XPUSHs(sv_2mortal(newSVpv(argv[i], 0)));
+    XPUSHs(sv_2mortal(owl_new_sv(argv[i])));
   }
   PUTBACK;
@@ -352 +364 @@
   path = owl_sprintf("%s/lib", owl_get_datadir());
   av_unshift(inc, 1);
-  av_store(inc, 0, newSVpv(path, 0));
+  av_store(inc, 0, owl_new_sv(path));
   owl_free(path);
 
@@ -437 +449 @@
 
   PUSHMARK(SP);
-  XPUSHs(sv_2mortal(newSVpv(name, 0)));
+  XPUSHs(sv_2mortal(owl_new_sv(name)));
   PUTBACK;
 
@@ -464 +476 @@
   PUSHMARK(SP);
   for(i=0;i<argc;i++) {
-    SV *tmp = newSVpv(argv[i], 0);
-    SvUTF8_on(tmp);
-    XPUSHs(sv_2mortal(tmp));
+    XPUSHs(sv_2mortal(owl_new_sv(argv[i])));
   }
   PUTBACK;
@@ -512 +522 @@
     owl_function_error("Perl callback is NULL!");
   }
-  text = newSVpv(owl_editwin_get_text(e), 0);
-  SvUTF8_on(text);
+  text = owl_new_sv(owl_editwin_get_text(e));
 
   ENTER;