Fossil

Check-in [fd35e339]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: fd35e3396a86fb1bf025c66916486a30d4231977
User & Date: drh 2016-07-23 22:02:52
Context
2016-07-25
12:25
Update the built-in SQLite to use the latest sqlite3_trace_v2() interface changes. check-in: f0d84833 user: drh tags: trunk
2016-07-23
22:02
Fix harmless compiler warnings. check-in: fd35e339 user: drh tags: trunk
20:35
Update the built-in SQLite to the 3.14 alpha. Use sqlite3_trace_v2() instead of sqlite3_trace(), which is not deprecated. check-in: b9573e55 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/db.c.

1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816

1817
1818
1819
1820
1821
1822
1823
  if( g.fSqlPrint ){
    for(i=0; i<argc; i++){
      char c = i==argc-1 ? '\n' : ' ';
      fossil_print("%s%c", sqlite3_value_text(argv[i]), c);
    }
  }
}
LOCAL int db_sql_trace(int m, void *notUsed, void *pNotUsed2, void *pX){
  const char *zSql = (const char*)pX;
  int n = strlen(zSql);
  fossil_trace("%s%s\n", zSql, (n>0 && zSql[n-1]==';') ? "" : ";");

}

/*
** Implement the user() SQL function.  user() takes no arguments and
** returns the user ID of the current user.
*/
LOCAL void db_sql_user(







|



>







1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
  if( g.fSqlPrint ){
    for(i=0; i<argc; i++){
      char c = i==argc-1 ? '\n' : ' ';
      fossil_print("%s%c", sqlite3_value_text(argv[i]), c);
    }
  }
}
LOCAL int db_sql_trace(unsigned m, void *notUsed, void *pNotUsed2, void *pX){
  const char *zSql = (const char*)pX;
  int n = strlen(zSql);
  fossil_trace("%s%s\n", zSql, (n>0 && zSql[n-1]==';') ? "" : ";");
  return 0;
}

/*
** Implement the user() SQL function.  user() takes no arguments and
** returns the user ID of the current user.
*/
LOCAL void db_sql_user(

Changes to src/fshell.c.

23
24
25
26
27
28
29

30
31
32
33
34
35
36
..
95
96
97
98
99
100
101

102
103
104
105
106
107
108
109
110
111
**
** The "fossil shell" command is intended for use with SEE-enabled fossil.
** It allows multiple commands to be issued without having to reenter the
** crypto phasephrase for each command.
*/
#include "config.h"
#include "fshell.h"



/*
** COMMAND: shell*
**
** Usage: %fossil shell
**
................................................................................
    if( childPid<0 ){
      printf("could not fork a child process to handle the command\n");
      fflush(stdout);
      continue;
    }
    if( childPid==0 ){
      /* This is the child process */

      main(nArg, azArg);
      exit(0);
    }else{
      /* The parent process */
      int status;
      waitpid(childPid, &status, 0);
    }
  }
#endif 
}







>







 







>










23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
..
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
**
** The "fossil shell" command is intended for use with SEE-enabled fossil.
** It allows multiple commands to be issued without having to reenter the
** crypto phasephrase for each command.
*/
#include "config.h"
#include "fshell.h"
#include <ctype.h>


/*
** COMMAND: shell*
**
** Usage: %fossil shell
**
................................................................................
    if( childPid<0 ){
      printf("could not fork a child process to handle the command\n");
      fflush(stdout);
      continue;
    }
    if( childPid==0 ){
      /* This is the child process */
      int main(int, char**);
      main(nArg, azArg);
      exit(0);
    }else{
      /* The parent process */
      int status;
      waitpid(childPid, &status, 0);
    }
  }
#endif 
}