Fossil

Check-in [d3f69bd4]
Login

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

Overview
Comment:Wrong parameter type: should be 64 bits otherwise the diffFlags parameter cannot hold all possible bits.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | diff-eolws
Files: files | file ages | folders
SHA1:d3f69bd48ec279739a88041de5572bf616f91fe2
User & Date: jan.nijtmans 2014-03-03 10:28:06
Context
2014-03-03
10:50
Implement new --ignore-space-at-sol option for all diff variants. And "-w" which means (for now) both --ignore-space-at-sol and --ignore-space-at-eol.

Problem: diffs using --ignore-space-at-sol don't indent any more. to be solved. check-in: 6392c032 user: jan.nijtmans tags: diff-eolws

10:28
Wrong parameter type: should be 64 bits otherwise the diffFlags parameter cannot hold all possible bits. check-in: d3f69bd4 user: jan.nijtmans tags: diff-eolws
10:15
Rename --ignore-eolws back to --ignore-space-at-eol. Change last parameter of break_into_lines() to hold multiple flags. This opens the way to implement --ignore-all-space" and "--ignore-space-at-sol" as well. check-in: 2dffb0e0 user: jan.nijtmans tags: diff-eolws
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
**
** Return 0 if the file is binary or contains a line that is
** too long.
**
** Profiling show that in most cases this routine consumes the bulk of
** the CPU time on a diff.
*/
static DLine *break_into_lines(const char *z, int n, int *pnLine, int diffFlags){
  int nLine, i, j, k, x;
  unsigned int h, h2;
  DLine *a;
  int ignoreWS = diffFlags & DIFF_IGNORE_EOLWS;

  /* Count the number of lines.  Allocate space to hold
  ** the returned array.
  */
  for(i=j=0, nLine=1; i<n; i++, j++){
    int c = z[i];
    if( c==0 ){







|



|







126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
**
** Return 0 if the file is binary or contains a line that is
** too long.
**
** Profiling show that in most cases this routine consumes the bulk of
** the CPU time on a diff.
*/
static DLine *break_into_lines(const char *z, int n, int *pnLine, u64 diffFlags){
  int nLine, i, j, k, x;
  unsigned int h, h2;
  DLine *a;
  int ignoreWS = (diffFlags & DIFF_IGNORE_EOLWS)!=0;

  /* Count the number of lines.  Allocate space to hold
  ** the returned array.
  */
  for(i=j=0, nLine=1; i<n; i++, j++){
    int c = z[i];
    if( c==0 ){