Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch branch-1.22 Excluding Merge-Ins
This is equivalent to a diff from f7e215bcac to 5dd5d39e7c
|
2012-03-19
| ||
| 12:45 | Avoid a valgrind warning in the side-by-side diff logic. Leaf check-in: 5dd5d39e7c user: drh tags: branch-1.22 | |
|
2012-03-18
| ||
| 02:15 | Removed the special-cased addition of g.zExtra==parameter named "name" when running in JSON mode because it causes no end of grief in several JSON handlers and none of the handlers rely on that handling. check-in: ccd6c879b4 user: stephan tags: trunk | |
|
2012-03-17
| ||
| 17:53 | Version 1.22 check-in: f7e215bcac user: drh tags: trunk, release, version-1.22 | |
| 14:59 | clean up error handling and permissions for various /json/user/save cases. check-in: d2bb7aeaa6 user: stephan tags: trunk | |
Changes to src/diff.c.
879 880 881 882 883 884 885 886 887 888 889 890 891 892 |
int na, nb; /* Number of lines shown from A and B */ int i, j; /* Loop counters */ int m, ma, mb;/* Number of lines to output */ int skip; /* Number of lines to skip */ int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ s.zLine = fossil_malloc( 10*width + 200 ); if( s.zLine==0 ) return; s.width = width; s.escHtml = escHtml; s.iStart = -1; s.iEnd = -1; A = p->aFrom; |
> |
879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 |
int na, nb; /* Number of lines shown from A and B */
int i, j; /* Loop counters */
int m, ma, mb;/* Number of lines to output */
int skip; /* Number of lines to skip */
int nChunk = 0; /* Number of chunks of diff output seen so far */
SbsLine s; /* Output line buffer */
memset(&s, 0, sizeof(s));
s.zLine = fossil_malloc( 10*width + 200 );
if( s.zLine==0 ) return;
s.width = width;
s.escHtml = escHtml;
s.iStart = -1;
s.iEnd = -1;
A = p->aFrom;
|