Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/libohana/include/ohana.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libohana/include/ohana.h (modified) (7 diffs)

branches/simtest_nebulous_branches/Ohana/src/libohana/include/ohana.h

@@ -68 +68 @@
 # endif
 
+#ifdef __GNUC__
+#define OHANA_FORMAT(style, fmt, varargs) __attribute__((format(style, fmt, varargs)))
+#else // __GNUC__
+#define OHANA_FORMAT(style, fmt, varargs)
+#endif // __GNUC__
+
 enum {
  LCK_UNLOCK,        /* file is unlocked */
@@ -87 +93 @@
  LCK_XCLD,          /* exclusive soft lock */
 };
+
+# ifndef NAN
+# ifndef BYTE_SWAP
+#  define __nan_bytes           { 0x7f, 0xc0, 0, 0 }
+# else
+#  define __nan_bytes           { 0, 0, 0xc0, 0x7f }
+# endif
+static union { unsigned char __c[4]; float __d; } __nan_union
+    __attribute_used__ = { __nan_bytes };
+# define NAN    (__nan_union.__d)
+# endif
 
 # ifndef M_PI
@@ -166 +183 @@
 int     mkdirhier              PROTO((char *path, int mode));
 void    make_backup            PROTO((char *filename));
-int     check_file_access      PROTO((char *basefile, int backup, int verbose));
+int     check_file_access      PROTO((char *basefile, int backup, int readwrite, int verbose));
 int     check_dir_access       PROTO((char *path, int verbose));
 int     check_file_exec        PROTO((char *filename));
@@ -177 +194 @@
 char   *SelectConfigFile       PROTO((int *argc, char **argv, char *progname));
 char   *LoadConfigFile         PROTO((char *filename));
-char   *ScanConfig             PROTO((char *config, char *field, char *mode, int N,...));
+char   *ScanConfig             PROTO((char *config, char *field, char *mode, int N,...)) OHANA_FORMAT(scanf, 3, 5);
 char   *expandline             PROTO((char *line, char *config));
 char   *fileextname            PROTO((char *file));
@@ -183 +200 @@
 
 /* others */
-int     Fseek                  PROTO((FILE *f, long offset, int whence));
+int     Fseek                  PROTO((FILE *f, off_t offset, int whence));
 char   *ohana_version          PROTO((void));
 
@@ -214 +231 @@
 int     EmptyIOBuffer          PROTO((IOBuffer *buffer, int Nmax, int fd));
 void    FreeIOBuffer           PROTO((IOBuffer *buffer));
-int     PrintIOBuffer          PROTO((IOBuffer *buffer, char *format, ...));
+int     PrintIOBuffer          PROTO((IOBuffer *buffer, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
 int     vPrintIOBuffer         PROTO((IOBuffer *buffer, char *format, va_list argp));
 
@@ -220 +237 @@
 int     ExpectMessage          PROTO((int device, double timeout, IOBuffer *message));
 int     ExpectCommand          PROTO((int device, int length, double timeout, IOBuffer *buffer));
-int     SendMessage            PROTO((int device, char *format, ...));
+int     SendMessage            PROTO((int device, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
 int     SendMessageFixed       PROTO((int device, int length, char *messge));
-int     SendCommand            PROTO((int device, int length, char *format, ...));
+int     SendCommand            PROTO((int device, int length, char *format, ...)) OHANA_FORMAT(printf, 3, 4);
 int     SendCommandV           PROTO((int device, int length, char *format, va_list argp));
 
 char   *CheckForMessage        PROTO((IOBuffer *buffer));
+
+off_t   Fread                  PROTO((void *ptr, off_t size, off_t nitems, FILE *f, char *type));
+off_t   Fwrite                 PROTO((void *ptr, off_t size, off_t nitems, FILE *f, char *type));
 
 /*