fix char related code

[guile-irrlicht.git] / src / material.cpp

diff --git a/src/material.cpp b/src/material.cpp
index 4be4054a550d9e7a7893fc44edadbccbc9e1fdd6..7c2eb0e6569370363d79dcd473d98b43e167fe5a 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -27,10 +27,8 @@
 #include "material.h"
 #include "material-types.h"
 
-
 using namespace irr;
 
-
 SCM
 video_SMaterial_make (SCM rest)
 {
@@ -121,22 +119,16 @@ video_SMaterial_make (SCM rest)
   return scm_from_pointer ((void*) material, NULL);
 }
 
-
-extern "C" {
-
-  void
-  init_material (void)
-  {
-    DEFINE_GSUBR ("video_SMaterial_make", 0, 0, 1, video_SMaterial_make);
-  }
-
+void
+init_material (void)
+{
+  DEFINE_GSUBR ("video_SMaterial_make", 0, 0, 1, video_SMaterial_make);
 }
 
-
 video::E_ANTI_ALIASING_MODE
 scm_to_anti_aliasing_mode (SCM anti_aliasing_mode)
 {
-  char* mode = scm_to_utf8_stringn (scm_symbol_to_string (anti_aliasing_mode), NULL);
+  char* mode = scm_to_utf8_string (scm_symbol_to_string (anti_aliasing_mode));
   if (!strcmp (mode, "off"))
     {
       return video::EAAM_OFF;
@@ -172,11 +164,10 @@ scm_to_anti_aliasing_mode (SCM anti_aliasing_mode)
     }
 }
 
-
 video::E_BLEND_OPERATION
 scm_to_blend_operation (SCM blend_operation)
 {
-  char* operation = scm_to_utf8_stringn (scm_symbol_to_string (blend_operation), NULL);
+  char* operation = scm_to_utf8_string (scm_symbol_to_string (blend_operation));
   if (!strcmp (operation, "none"))
     {
       return video::EBO_NONE;
@@ -224,11 +215,10 @@ scm_to_blend_operation (SCM blend_operation)
     }
 }
 
-
 video::E_COLOR_MATERIAL
 scm_to_color_material (SCM color_material)
 {
-  char* material = scm_to_utf8_stringn (scm_symbol_to_string (color_material), NULL);
+  char* material = scm_to_utf8_string (scm_symbol_to_string (color_material));
   if (!strcmp (material, "none"))
     {
       return video::ECM_NONE;
@@ -260,11 +250,10 @@ scm_to_color_material (SCM color_material)
     }
 }
 
-
 video::E_COLOR_PLANE
 scm_to_color_plane (SCM color_plane)
 {
-  char* plane = scm_to_utf8_stringn (scm_symbol_to_string (color_plane), NULL);
+  char* plane = scm_to_utf8_string (scm_symbol_to_string (color_plane));
   if (!strcmp (plane, "none"))
     {
       return video::ECP_NONE;
@@ -300,11 +289,10 @@ scm_to_color_plane (SCM color_plane)
     }
 }
 
-
 video::E_COMPARISON_FUNC
 scm_to_comparison_func (SCM comparison_func)
 {
-  char* func = scm_to_utf8_stringn (scm_symbol_to_string (comparison_func), NULL);
+  char* func = scm_to_utf8_string (scm_symbol_to_string (comparison_func));
   if (!strcmp (func, "never"))
     {
       return video::ECFN_NEVER;
@@ -344,11 +332,10 @@ scm_to_comparison_func (SCM comparison_func)
     }
 }
 
-
 video::E_POLYGON_OFFSET
 scm_to_polygon_offset (SCM polygon_offset)
 {
-  char* offset = scm_to_utf8_stringn (scm_symbol_to_string (polygon_offset), NULL);
+  char* offset = scm_to_utf8_string (scm_symbol_to_string (polygon_offset));
   if (!strcmp (offset, "back"))
     {
       return video::EPO_BACK;