Merge branch 'zscanner' into zscanner-load
Conflicts: src/common/errcode.h
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- Doxy.page.h 17 additions, 13 deletionsDoxy.page.h
- Doxyfile 1 addition, 0 deletionsDoxyfile
- Knot.files 4 additions, 2 deletionsKnot.files
- src/Makefile.am 1 addition, 1 deletionsrc/Makefile.am
- src/common/descriptor_new.c 11 additions, 12 deletionssrc/common/descriptor_new.c
- src/common/errcode.c 3 additions, 2 deletionssrc/common/errcode.c
- src/common/errcode.h 3 additions, 1 deletionsrc/common/errcode.h
- src/libknot/rrset.c 28 additions, 1 deletionsrc/libknot/rrset.c
- src/zcompile/zcompile.c 4 additions, 4 deletionssrc/zcompile/zcompile.c
- src/zscanner/NOTES 2 additions, 2 deletionssrc/zscanner/NOTES
- src/zscanner/file_loader.c 54 additions, 63 deletionssrc/zscanner/file_loader.c
- src/zscanner/file_loader.h 46 additions, 8 deletionssrc/zscanner/file_loader.h
- src/zscanner/scanner.h 134 additions, 40 deletionssrc/zscanner/scanner.h
- src/zscanner/scanner.rl 19 additions, 18 deletionssrc/zscanner/scanner.rl
- src/zscanner/scanner_body.rl 116 additions, 100 deletionssrc/zscanner/scanner_body.rl
- src/zscanner/scanner_functions.c 121 additions, 67 deletionssrc/zscanner/scanner_functions.c
- src/zscanner/scanner_functions.h 59 additions, 9 deletionssrc/zscanner/scanner_functions.h
- src/zscanner/test/data/test1 0 additions, 70 deletionssrc/zscanner/test/data/test1
- src/zscanner/test/data/test2 0 additions, 144 deletionssrc/zscanner/test/data/test2
Please register or sign in to comment