[Gnash-commit] gnash ChangeLog extensions/dejagnu/dejagnu.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/09 18:20:42

Modified files:
        .              : ChangeLog 
        extensions/dejagnu: dejagnu.cpp 
        extensions/fileio: fileio.cpp 

Log message:
                * extensions/dejagnu/dejagnu.cpp, extensions/fileio/fileio.cpp:
                  Use builtin_function and init_member for members 
initialization.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2593&r2=1.2594
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2593
retrieving revision 1.2594
diff -u -b -r1.2593 -r1.2594
--- ChangeLog   9 Mar 2007 15:19:26 -0000       1.2593
+++ ChangeLog   9 Mar 2007 18:20:41 -0000       1.2594
@@ -1,5 +1,7 @@
 2007-03-09 Sandro Santilli <address@hidden>
 
+       * extensions/dejagnu/dejagnu.cpp, extensions/fileio/fileio.cpp:
+         Use builtin_function and init_member for members initialization.
        * server/as_value.{cpp,h}, server/vm/ASHandlers.cpp,
          server/vm/action.cpp: Drop C_FUNCTION as_value type.
          WARNING: attempts to initialize as_values with

Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/dejagnu/dejagnu.cpp      17 Dec 2006 20:24:58 -0000      1.4
+++ extensions/dejagnu/dejagnu.cpp      9 Mar 2007 18:20:41 -0000       1.5
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -49,9 +49,9 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    obj->set_member("pass", &dejagnu_pass);
-    obj->set_member("fail", &dejagnu_fail);
-    obj->set_member("totals", &dejagnu_totals);
+    obj->init_member("pass", new builtin_function(dejagnu_pass));
+    obj->init_member("fail", new builtin_function(dejagnu_fail));
+    obj->init_member("totals", new builtin_function(dejagnu_totals));
 }
 
 static as_object*
@@ -95,6 +95,7 @@
 
     passed++;
     dbglogfile << "PASSED: " << msg << endl;
+    return NULL;
 }
 
 const char *
@@ -104,6 +105,7 @@
 
     failed++;
     dbglogfile << "FAILED: " << msg << endl;
+    return NULL;
 }
 
 void
@@ -164,7 +166,7 @@
            attachInterface(cl.get());
        }
        
-       obj.set_member("DejaGnu", cl.get());
+       obj.init_member("DejaGnu", cl.get());
     }
 } // end of extern C
 

Index: extensions/fileio/fileio.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/fileio.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/fileio/fileio.cpp        8 Mar 2007 17:47:54 -0000       1.7
+++ extensions/fileio/fileio.cpp        9 Mar 2007 18:20:41 -0000       1.8
@@ -74,27 +74,27 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    obj->set_member("fopen", &fileio_fopen);
-    obj->set_member("fread", &fileio_fread);
-    obj->set_member("fgetc", &fileio_fgetc);
-    obj->set_member("fgets", &fileio_fgets);
-    obj->set_member("gets", &fileio_fgets);
-    obj->set_member("getchar", &fileio_getchar);
-
-    obj->set_member("fwrite", &fileio_fwrite);
-    obj->set_member("fputc", &fileio_fputc);
-    obj->set_member("fputs", &fileio_fputs);
-    obj->set_member("puts", &fileio_puts);
-    obj->set_member("putchar", &fileio_putchar);
-    
-    obj->set_member("fflush", &fileio_fflush);
-    obj->set_member("fseek", &fileio_fseek);
-    obj->set_member("ftell", &fileio_ftell);
-    obj->set_member("fclose", &fileio_fclose);
+    obj->init_member("fopen", new builtin_function(fileio_fopen));
+    obj->init_member("fread", new builtin_function(fileio_fread));
+    obj->init_member("fgetc", new builtin_function(fileio_fgetc));
+    obj->init_member("fgets", new builtin_function(fileio_fgets));
+    obj->init_member("gets", new builtin_function(fileio_fgets));
+    obj->init_member("getchar", new builtin_function(fileio_getchar));
+
+    obj->init_member("fwrite", new builtin_function(fileio_fwrite));
+    obj->init_member("fputc", new builtin_function(fileio_fputc));
+    obj->init_member("fputs", new builtin_function(fileio_fputs));
+    obj->init_member("puts", new builtin_function(fileio_puts));
+    obj->init_member("putchar", new builtin_function(fileio_putchar));
+    
+    obj->init_member("fflush", new builtin_function(fileio_fflush));
+    obj->init_member("fseek", new builtin_function(fileio_fseek));
+    obj->init_member("ftell", new builtin_function(fileio_ftell));
+    obj->init_member("fclose", new builtin_function(fileio_fclose));
     
-    obj->set_member("unlink", &fileio_unlink);
+    obj->init_member("unlink", new builtin_function(fileio_unlink));
     
-    obj->set_member("scandir", &fileio_scandir);
+    obj->init_member("scandir", new builtin_function(fileio_scandir));
 }
 
 static as_object*