Changeset 2992 for trunk/src

Timestamp:

Nov 1, 2016, 11:06:08 PM (9 years ago)

Author:

bird

Message:

fts-nt: prefix public names.

Location:

trunk/src/lib/nt

Files:

• fts-nt.c (modified) (7 diffs)
• fts-nt.h (modified) (1 diff)

trunk/src/lib/nt/fts-nt.c

@@ -95 +95 @@
 static FTSENT   *fts_sort(FTS *, FTSENT *, size_t);
 static int       fts_stat(FTS *, FTSENT *, int, HANDLE);
-static int   fts_process_stats(FTSENT *, BirdStat_T const *);
+static int       fts_process_stats(FTSENT *, BirdStat_T const *);
 
 #define ISDOT(a)        (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
@@ -127 +127 @@
 
 FTS * FTSCALL
-fts_open(char * const *argv, int options,
+nt_fts_open(char * const *argv, int options,
     int (*compar)(const FTSENT * const *, const FTSENT * const *))
 {
@@ -271 +271 @@
 
 int FTSCALL
-fts_close(FTS *sp)
+nt_fts_close(FTS *sp)
 {
         FTSENT *freep, *p;
@@ -323 +323 @@
 
 FTSENT * FTSCALL
-fts_read(FTS *sp)
+nt_fts_read(FTS *sp)
 {
         FTSENT *p, *tmp;
@@ -498 +498 @@
 /* ARGSUSED */
 int FTSCALL
-fts_set(FTS *sp, FTSENT *p, int instr)
+nt_fts_set(FTS *sp, FTSENT *p, int instr)
 {
         if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
@@ -510 +510 @@
 
 FTSENT * FTSCALL
-fts_children(FTS *sp, int instr)
+nt_fts_children(FTS *sp, int instr)
 {
         FTSENT *p;
@@ -584 +584 @@
 
 void FTSCALL
-fts_set_clientptr(FTS *sp, void *clientptr)
+nt_fts_set_clientptr(FTS *sp, void *clientptr)
 {
 

trunk/src/lib/nt/fts-nt.h

@@ -147 +147 @@
 extern "C" {
 #endif
-FTSENT  *FTSCALL fts_children(FTS *, int);
-int      FTSCALL fts_close(FTS *);
-void    *FTSCALL fts_get_clientptr(FTS *);
+
+FTSENT  *FTSCALL nt_fts_children(FTS *, int);
+int      FTSCALL nt_fts_close(FTS *);
+void    *FTSCALL nt_fts_get_clientptr(FTS *);
 #define  fts_get_clientptr(fts) ((fts)->fts_clientptr)
-FTS     *FTSCALL fts_get_stream(FTSENT *);
+FTS     *FTSCALL nt_fts_get_stream(FTSENT *);
 #define  fts_get_stream(ftsent) ((ftsent)->fts_fts)
-FTS     *FTSCALL fts_open(char * const *, int,
+FTS     *FTSCALL nt_fts_open(char * const *, int,
             int (FTSCALL*)(const FTSENT * const *, const FTSENT * const *));
-FTSENT  *FTSCALL fts_read(FTS *);
-int      FTSCALL fts_set(FTS *, FTSENT *, int);
-void     FTSCALL fts_set_clientptr(FTS *, void *);
+FTSENT  *FTSCALL nt_fts_read(FTS *);
+int      FTSCALL nt_fts_set(FTS *, FTSENT *, int);
+void     FTSCALL nt_fts_set_clientptr(FTS *, void *);
+
+/* API mappings. */
+#define fts_children(a_pFts, a_iInstr)                  nt_fts_children(a_pFts, a_iInstr)
+#define fts_close(a_pFts)                               nt_fts_close(a_pFts)
+#define fts_open(a_papszArgs, a_fOptions, a_pfnCompare) nt_fts_open(a_papszArgs, a_fOptions, a_pfnCompare)
+#define fts_read(a_pFts)                                nt_fts_read(a_pFts)
+#define fts_set(a_pFts, a_pFtsEntry, a_iInstr)          nt_fts_set(a_pFts, a_pFtsEntry, a_iInstr)
+#define fts_set_clientptr(a_pFts, a_pvUser)             nt_fts_set_clientptr(a_pFts, a_pvUser)
+
 #ifdef __cplusplus
 }