Check-in [d63f87c003]
Not logged in

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

Overview
Comment:Fix a C89 violation in main.c.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d63f87c0030a10945c4614a2c007de433a67b5ca
User & Date: drh 2009-03-22 13:44:43.000
References
2009-08-08
05:42 Tested ticket [d37b9eadb3]: Encoding problems after rebuild plus 3 other changes artifact: ab7b90e593 user: anonymous
2009-04-24
12:24 New ticket [3e6775edfe] Can't pass html comments through wiki.. artifact: 1dbd133656 user: anonymous
12:15 New ticket [19a818b157] Allow Wiki link to be redirected like the Home link.. artifact: 0439d0e214 user: anonymous
Context
2009-03-24
22:03
Improvements to the delta generator algorthm so that it runs much faster on large files with very few similarities. There is no change to the delta format generated, so this is fully backwards and forwards compatible. check-in: 522104c2cd user: drh tags: trunk
2009-03-22
13:44
Fix a C89 violation in main.c. check-in: d63f87c003 user: drh tags: trunk
13:18
Add many new test cases for 3-way merge. No new problems found. check-in: 92638367d8 user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
329
330
331
332
333
334
335

336
337
338
339
340
341
342
343
344
const char *find_option(const char *zLong, const char *zShort, int hasArg){
  int i;
  int nLong;
  const char *zReturn = 0;
  assert( hasArg==0 || hasArg==1 );
  nLong = strlen(zLong);
  for(i=2; i<g.argc; i++){

    if (i+hasArg >= g.argc) break;
    char *z = g.argv[i];
    if( z[0]!='-' ) continue;
    z++;
    if( z[0]=='-' ){
      if( z[1]==0 ){
        remove_from_argv(i, 1);
        break;
      }







>

|







329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
const char *find_option(const char *zLong, const char *zShort, int hasArg){
  int i;
  int nLong;
  const char *zReturn = 0;
  assert( hasArg==0 || hasArg==1 );
  nLong = strlen(zLong);
  for(i=2; i<g.argc; i++){
    char *z;
    if (i+hasArg >= g.argc) break;
    z = g.argv[i];
    if( z[0]!='-' ) continue;
    z++;
    if( z[0]=='-' ){
      if( z[1]==0 ){
        remove_from_argv(i, 1);
        break;
      }