Make the inline const-time functions static.

[openssl.git] / ms / applink.c

diff --git a/ms/applink.c b/ms/applink.c
index 4333d2639dfc566572828a59702c50051e6ea524..54a0a642628a25c6a5a0909c2b50174c22f5052d 100644 (file)
--- a/ms/applink.c
+++ b/ms/applink.c
@@ -8,21 +8,51 @@
 #define APPLINK_FSETMOD        8
 #define APPLINK_FEOF   9
 #define APPLINK_FCLOSE         10      /* should not be used */
-#define APPLINK_MAX    10      /* always same as last macro */
+
+#define APPLINK_FOPEN  11      /* solely for completeness */
+#define APPLINK_FSEEK  12
+#define APPLINK_FTELL  13
+#define APPLINK_FFLUSH 14
+#define APPLINK_FERROR 15
+#define APPLINK_CLEARERR 16
+#define APPLINK_FILENO 17      /* to be used with below */
+
+#define APPLINK_OPEN   18      /* formally can't be used, as flags can vary */
+#define APPLINK_READ   19
+#define APPLINK_WRITE  20
+#define APPLINK_LSEEK  21
+#define APPLINK_CLOSE  22
+#define APPLINK_MAX    22      /* always same as last macro */
 
 #ifndef APPMACROS_ONLY
 #include <stdio.h>
 #include <io.h>
 #include <fcntl.h>
 
-static void *app_stdin()       { return stdin;  }
-static void *app_stdout()      { return stdout; }
-static void *app_stderr()      { return stderr; }
-static int   app_feof(FILE *fp)        { return feof(fp); }
+static void *app_stdin(void)           { return stdin;  }
+static void *app_stdout(void)          { return stdout; }
+static void *app_stderr(void)          { return stderr; }
+static int   app_feof(FILE *fp)                { return feof(fp); }
+static int   app_ferror(FILE *fp)      { return ferror(fp); }
+static void  app_clearerr(FILE *fp)    { clearerr(fp); }
+static int   app_fileno(FILE *fp)      { return _fileno(fp); }
 static int   app_fsetmod(FILE *fp,char mod)
 { return _setmode (_fileno(fp),mod=='b'?_O_BINARY:_O_TEXT); }
 
-__declspec(dllexport) void **OPENSSL_Applink()
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__declspec(dllexport)
+void **
+#if defined(__BORLANDC__)
+__stdcall      /* __stdcall appears to be the only way to get the name
+                * decoration right with Borland C. Otherwise it works
+                * purely incidentally, as we pass no parameters. */
+#else
+__cdecl
+#endif
+OPENSSL_Applink(void)
 { static int once=1;
   static void *OPENSSL_ApplinkTable[APPLINK_MAX+1]={(void *)APPLINK_MAX};
 
@@ -37,9 +67,28 @@ __declspec(dllexport) void **OPENSSL_Applink()
        OPENSSL_ApplinkTable[APPLINK_FSETMOD]   = app_fsetmod;
        OPENSSL_ApplinkTable[APPLINK_FEOF]      = app_feof;
        OPENSSL_ApplinkTable[APPLINK_FCLOSE]    = fclose;
+
+       OPENSSL_ApplinkTable[APPLINK_FOPEN]     = fopen;
+       OPENSSL_ApplinkTable[APPLINK_FSEEK]     = fseek;
+       OPENSSL_ApplinkTable[APPLINK_FTELL]     = ftell;
+       OPENSSL_ApplinkTable[APPLINK_FFLUSH]    = fflush;
+       OPENSSL_ApplinkTable[APPLINK_FERROR]    = app_ferror;
+       OPENSSL_ApplinkTable[APPLINK_CLEARERR]  = app_clearerr;
+       OPENSSL_ApplinkTable[APPLINK_FILENO]    = app_fileno;
+
+       OPENSSL_ApplinkTable[APPLINK_OPEN]      = _open;
+       OPENSSL_ApplinkTable[APPLINK_READ]      = _read;
+       OPENSSL_ApplinkTable[APPLINK_WRITE]     = _write;
+       OPENSSL_ApplinkTable[APPLINK_LSEEK]     = _lseek;
+       OPENSSL_ApplinkTable[APPLINK_CLOSE]     = _close;
+
        once = 0;
     }
 
   return OPENSSL_ApplinkTable;
 }
+
+#ifdef __cplusplus
+}
+#endif
 #endif