r435 - in trunk: . libfetch

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Jan 17 05:19:17 EST 2008


Author: icculus
Date: 2008-01-17 05:19:16 -0500 (Thu, 17 Jan 2008)
New Revision: 435

Modified:
   trunk/fileio.c
   trunk/fileio.h
   trunk/libfetch/common.c
   trunk/lua_glue.c
   trunk/mojosetup.c
Log:
...not sure why MojoInput_fromURL() was named differently from all the other
 MojoInput_newFromXXX() functions...


Modified: trunk/fileio.c
===================================================================
--- trunk/fileio.c	2008-01-17 10:18:30 UTC (rev 434)
+++ trunk/fileio.c	2008-01-17 10:19:16 UTC (rev 435)
@@ -708,11 +708,11 @@
 
 // This stub is here if we didn't compile in libfetch...
 #if !SUPPORT_URL_HTTP && !SUPPORT_URL_FTP
-MojoInput *MojoInput_fromURL(const char *url)
+MojoInput *MojoInput_newFromURL(const char *url)
 {
     logError("No networking support in this build.");
     return NULL;
-} // MojoInput_fromURL
+} // MojoInput_newFromURL
 #endif
 
 // end of fileio.c ...

Modified: trunk/fileio.h
===================================================================
--- trunk/fileio.h	2008-01-17 10:18:30 UTC (rev 434)
+++ trunk/fileio.h	2008-01-17 10:19:16 UTC (rev 435)
@@ -107,7 +107,7 @@
                                  MojoChecksums *checksums, int64 maxbytes,
                                  MojoInput_FileCopyCallback cb, void *data);
 
-MojoInput *MojoInput_fromURL(const char *url);
+MojoInput *MojoInput_newFromURL(const char *url);
 
 #ifdef __cplusplus
 }

Modified: trunk/libfetch/common.c
===================================================================
--- trunk/libfetch/common.c	2008-01-17 10:18:30 UTC (rev 434)
+++ trunk/libfetch/common.c	2008-01-17 10:19:16 UTC (rev 435)
@@ -1060,7 +1060,7 @@
 
 
 
-MojoInput *MojoInput_fromURL(const char *url)
+MojoInput *MojoInput_newFromURL(const char *url)
 {
     MojoInput *retval = NULL;
     if (url != NULL)
@@ -1087,6 +1087,6 @@
         } // if
     } // if
     return retval;
-} // MojoInput_fromURL
+} // MojoInput_newFromURL
 #endif
 

Modified: trunk/lua_glue.c
===================================================================
--- trunk/lua_glue.c	2008-01-17 10:18:30 UTC (rev 434)
+++ trunk/lua_glue.c	2008-01-17 10:19:16 UTC (rev 435)
@@ -791,7 +791,7 @@
 static int luahook_download(lua_State *L)
 {
     const char *src = luaL_checkstring(L, 1);
-    MojoInput *in = MojoInput_fromURL(src);
+    MojoInput *in = MojoInput_newFromURL(src);
     return do_writefile(L, in, MojoPlatform_defaultFilePerms());
 } // luahook_download
 

Modified: trunk/mojosetup.c
===================================================================
--- trunk/mojosetup.c	2008-01-17 10:18:30 UTC (rev 434)
+++ trunk/mojosetup.c	2008-01-17 10:19:16 UTC (rev 435)
@@ -814,7 +814,7 @@
         int64 total_br = 0;
         int64 br = 0;
         printf("\n\nFetching '%s' ...\n", url);
-        MojoInput *io = MojoInput_fromURL(url);
+        MojoInput *io = MojoInput_newFromURL(url);
         if (io == NULL)
         {
             fprintf(stderr, "failed!\n");




More information about the mojosetup-commits mailing list