Check-in [24e298edd0]
Not logged in

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

Overview
Comment:Fix some more compiler warnings seen with MSVC.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:24e298edd02f9b851df1b4de74233a30ed4d2f7b
User & Date: mistachkin 2011-11-05 03:45:26
References
2011-11-07
00:34
Fix some more compiler warnings seen with MSVC. Cherrypick from [24e298edd0]. check-in: dfdda77dfc user: mistachkin tags: jimtcl
Context
2011-11-14
03:02
Update the built-in SQLite to version 3.7.9 plus the 8-byte alignment fix in branch-3.7.9. check-in: 0c8d1ca9cd user: drh tags: trunk
00:13
fossil import --incremental should set the appropriate ancestor for the first commit in each branch being added Leaf check-in: c95d7a9c3d user: steveb tags: steveb-fixes
2011-11-13
09:11
Merge with trunk check-in: c30eaa8862 user: ashish tags: ashish-ipv6
2011-11-05
22:50
Add fixes to classic makefile to support MinGW mostly automatically. check-in: 590cee0ec9 user: mistachkin tags: auto-mingw-makefile
03:45
Fix some more compiler warnings seen with MSVC. check-in: 24e298edd0 user: mistachkin tags: trunk
03:22
Be sure to escape any backslashes when emitting #line preprocessor directives in the translate.c tool, cherrypick from [e36ad719cf]. check-in: c2bed5b3db user: mistachkin tags: trunk
Changes

Changes to src/login.c.

978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
}

/*
** Zeroes out g.perm and calls login_set_capabilities(zCap,flags).
*/
void login_replace_capabilities(const char *zCap, unsigned flags){
  memset(&g.perm, 0, sizeof(g.perm));
  return login_set_capabilities(zCap, flags);
}

/*
** If the current login lacks any of the capabilities listed in
** the input, then return 0.  If all capabilities are present, then
** return 1.
*/







|







978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
}

/*
** Zeroes out g.perm and calls login_set_capabilities(zCap,flags).
*/
void login_replace_capabilities(const char *zCap, unsigned flags){
  memset(&g.perm, 0, sizeof(g.perm));
  login_set_capabilities(zCap, flags);
}

/*
** If the current login lacks any of the capabilities listed in
** the input, then return 0.  If all capabilities are present, then
** return 1.
*/

Changes to src/main.c.

315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
  return 1+(cnt>1);
}

/*
** atexit() handler which frees up "some" of the resources
** used by fossil.
*/
void fossil_atexit() {
#ifdef FOSSIL_ENABLE_JSON
  cson_value_free(g.json.gc.v);
  memset(&g.json, 0, sizeof(g.json));
#endif
  free(g.zErrMsg);
  if(g.db){
    db_close(0);







|







315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
  return 1+(cnt>1);
}

/*
** atexit() handler which frees up "some" of the resources
** used by fossil.
*/
void fossil_atexit(void) {
#ifdef FOSSIL_ENABLE_JSON
  cson_value_free(g.json.gc.v);
  memset(&g.json, 0, sizeof(g.json));
#endif
  free(g.zErrMsg);
  if(g.db){
    db_close(0);

Changes to src/setup.c.

248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
void user_edit(void){
  const char *zId, *zLogin, *zInfo, *zCap, *zPw;
  char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap;
  char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae;
  char *oat, *oau, *oav, *oab, *oax, *oaz;
  const char *zGroup;
  const char *zOldLogin;
  const char *inherit[128];
  int doWrite;
  int uid;
  int higherUser = 0;  /* True if user being edited is SETUP and the */
                       /* user doing the editing is ADMIN.  Disallow editing */

  /* Must have ADMIN privleges to access this page
  */







|







248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
void user_edit(void){
  const char *zId, *zLogin, *zInfo, *zCap, *zPw;
  char *oaa, *oas, *oar, *oaw, *oan, *oai, *oaj, *oao, *oap;
  char *oak, *oad, *oac, *oaf, *oam, *oah, *oag, *oae;
  char *oat, *oau, *oav, *oab, *oax, *oaz;
  const char *zGroup;
  const char *zOldLogin;
  char *inherit[128];
  int doWrite;
  int uid;
  int higherUser = 0;  /* True if user being edited is SETUP and the */
                       /* user doing the editing is ADMIN.  Disallow editing */

  /* Must have ADMIN privleges to access this page
  */