Login
Check-in [6ecdbab284]
Login

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

Overview
Comment:Cleaned up non-undefined macros which broke the amalgamation build.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6ecdbab284467e2d4780addbe2d12043130eaf5e
User & Date: stephan 2021-12-23 07:14:00.810
Context
2021-12-23
07:46
Added a missing result code check in fsl_cidiff(). Added --save-format flag to f-vdiff to tell it to persist the current diff format as its future default. check-in: d80e895807 user: stephan tags: trunk
07:14
Cleaned up non-undefined macros which broke the amalgamation build. check-in: 6ecdbab284 user: stephan tags: trunk
07:01
Added fsl_cidiff() API and f-test-cidiff test app. check-in: 1c6aeaf5ce user: stephan tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/repo.c.
︙︙
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376

2377
2378
2379
2380
2381
2382
2383

  fsl_deck d2 = fsl_deck_empty;
  fsl_card_F const * fc1;
  fsl_card_F const * fc2;
  int rc;
  fsl_cidiff_state cst = fsl_cidiff_state_empty;
  if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO;
  rc = fsl_deck_load_rid(f, &d1, opt->v1, FSL_SATYPE_CHECKIN);
  #define RC if(rc) goto end
  RC;
  rc = fsl_deck_load_rid(f, &d2, opt->v2, FSL_SATYPE_CHECKIN);
  RC;

  rc = fsl_deck_F_rewind(&d1);
  if(0==rc) rc = fsl_deck_F_rewind(&d2);
  fsl_deck_F_next(&d1, &fc1);
  fsl_deck_F_next(&d2, &fc2);
  cst.f = f;
  cst.opt = opt;
  cst.d1 = &d1;








|
<

<
>








2366
2367
2368
2369
2370
2371
2372
2373

2374

2375
2376
2377
2378
2379
2380
2381
2382

  fsl_deck d2 = fsl_deck_empty;
  fsl_card_F const * fc1;
  fsl_card_F const * fc2;
  int rc;
  fsl_cidiff_state cst = fsl_cidiff_state_empty;
  if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO;
  rc = fsl_deck_load_rid(f, &d1, opt->v1, FSL_SATYPE_CHECKIN);
  if(rc) goto end;

  rc = fsl_deck_load_rid(f, &d2, opt->v2, FSL_SATYPE_CHECKIN);

  if(rc) goto end;
  rc = fsl_deck_F_rewind(&d1);
  if(0==rc) rc = fsl_deck_F_rewind(&d2);
  fsl_deck_F_next(&d1, &fc1);
  fsl_deck_F_next(&d2, &fc2);
  cst.f = f;
  cst.opt = opt;
  cst.d1 = &d1;
︙︙
Changes to src/sha3.c.
︙︙
629
630
631
632
633
634
635


























636
637
638

    fsl_sha3_end(&ctx);
    rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex));
    return rc;
#endif
  }
}




























#undef SHA3_BYTEORDER
#undef MARKER








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>




629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664

    fsl_sha3_end(&ctx);
    rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex));
    return rc;
#endif
  }
}

#undef A00
#undef A01
#undef A02
#undef A03
#undef A04
#undef A10
#undef A11
#undef A12
#undef A13
#undef A14
#undef A20
#undef A21
#undef A22
#undef A23
#undef A24
#undef A30
#undef A31
#undef A32
#undef A33
#undef A34
#undef A40
#undef A41
#undef A42
#undef A43
#undef A44
#undef ROL64

#undef SHA3_BYTEORDER
#undef MARKER