Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Silence compiler warnings about unused variables in print_timeline. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | tcl-integration |
Files: | files | file ages | folders |
SHA1: |
b76ce3d5f1c329871702098700da99d4 |
User & Date: | mistachkin 2011-08-29 10:31:45.570 |
References
2011-08-29
| ||
13:35 | Remove unused variables from timeline.c. Like [b76ce3d5f1c329] but omits the change to th_tcl.c. ... (check-in: 0b937136 user: drh tags: trunk) | |
Context
2011-09-01
| ||
22:06 | Merge all the latest trunk changes into the tcl-integration branch. ... (check-in: 26c515f6 user: drh tags: tcl-integration) | |
2011-08-29
| ||
10:31 | Silence compiler warnings about unused variables in print_timeline. ... (check-in: b76ce3d5 user: mistachkin tags: tcl-integration) | |
09:27 | Add workaround for bug in Tcl_EvalObjCmd when compiled against Tcl 8.6. ... (check-in: 3a626569 user: mistachkin tags: tcl-integration) | |
Changes
Changes to src/th_tcl.c.
︙ | ︙ | |||
42 43 44 45 46 47 48 | ckfree((char *)objv); /* ** Returns the Tcl interpreter result as a string with the associated length. ** If the Tcl interpreter or the Tcl result are NULL, the length will be 0. ** If the length pointer is NULL, the length will not be stored. */ | | > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | ckfree((char *)objv); /* ** Returns the Tcl interpreter result as a string with the associated length. ** If the Tcl interpreter or the Tcl result are NULL, the length will be 0. ** If the length pointer is NULL, the length will not be stored. */ static char *getTclResult( Tcl_Interp *pInterp, int *pN ){ Tcl_Obj *resultPtr; if( !pInterp ){ /* This should not happen. */ if( pN ) *pN = 0; return 0; } resultPtr = Tcl_GetObjResult(pInterp); if( !resultPtr ){ /* This should not happen either? */ |
︙ | ︙ |
Changes to src/timeline.c.
︙ | ︙ | |||
1310 1311 1312 1313 1314 1315 1316 | n += strlen(zPrefix); } zFree = sqlite3_mprintf("[%.10s] %s%s", zUuid, zPrefix, zCom); nLine += comment_print(zFree, 9, 79); sqlite3_free(zFree); if(showfiles){ | < < < | 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 | n += strlen(zPrefix); } zFree = sqlite3_mprintf("[%.10s] %s%s", zUuid, zPrefix, zCom); nLine += comment_print(zFree, 9, 79); sqlite3_free(zFree); if(showfiles){ if( !fchngQueryInit ){ db_prepare(&fchngQuery, "SELECT (pid==0) AS isnew," " (fid==0) AS isdel," " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," " (SELECT uuid FROM blob WHERE rid=fid)," " (SELECT uuid FROM blob WHERE rid=pid)" " FROM mlink" " WHERE mid=:mid AND pid!=fid" " ORDER BY 3 /*sort*/" ); fchngQueryInit = 1; } db_bind_int(&fchngQuery, ":mid", rid); while( db_step(&fchngQuery)==SQLITE_ROW ){ const char *zFilename = db_column_text(&fchngQuery, 2); int isNew = db_column_int(&fchngQuery, 0); int isDel = db_column_int(&fchngQuery, 1); if( isNew ){ fossil_print(" ADDED %s\n",zFilename); }else if( isDel ){ fossil_print(" DELETED %s\n",zFilename); }else{ fossil_print(" EDITED %s\n", zFilename); } |
︙ | ︙ |