Diff of the two buildlogs: -- --- b1/build.log 2023-04-11 18:20:44.176765278 +0000 +++ b2/build.log 2023-04-11 18:34:53.580324878 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Tue Apr 11 06:04:34 -12 2023 -I: pbuilder-time-stamp: 1681236274 +I: Current time: Tue May 14 14:43:48 +14 2024 +I: pbuilder-time-stamp: 1715647428 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] I: copying local configuration @@ -16,7 +16,7 @@ I: copying [./coccinelle_1.1.1.deb.orig.tar.gz] I: copying [./coccinelle_1.1.1.deb-2.debian.tar.xz] I: Extracting source -gpgv: Signature made Wed Nov 9 23:15:14 2022 -12 +gpgv: Signature made Fri Nov 11 01:15:14 2022 +14 gpgv: using RSA key 02054829E12D0F2A8E648E62745C4766D4CACDFF gpgv: Can't check signature: No public key dpkg-source: warning: cannot verify inline signature for ./coccinelle_1.1.1.deb-2.dsc: no acceptable signature found @@ -30,11 +30,20 @@ dpkg-source: info: applying dont-expose-parmap.diff I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/17026/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/D01_modify_environment starting +debug: Running on codethink9-arm64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +lrwxrwxrwx 1 root root 4 Jan 6 2023 /bin/sh -> dash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/D02_print_environment starting I: set BUILDDIR='/build' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME='pbuilder2' BUILD_ARCH='arm64' DEBIAN_FRONTEND='noninteractive' DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=8' @@ -44,38 +53,38 @@ IFS=' ' LANG='C' - LANGUAGE='en_US:en' + LANGUAGE='nl_BE:nl' LC_ALL='C' MAIL='/var/mail/root' OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' + PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path' PBCURRENTCOMMANDLINEOPERATION='build' PBUILDER_OPERATION='build' PBUILDER_PKGDATADIR='/usr/share/pbuilder' PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' PBUILDER_SYSCONFDIR='/etc' - PPID='17026' + PPID='9322' PS1='# ' PS2='> ' PS4='+ ' PWD='/' SHELL='/bin/bash' SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.Njfp9p3j/pbuilderrc_QRaq --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Njfp9p3j/b1 --logfile b1/build.log coccinelle_1.1.1.deb-2.dsc' + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.Njfp9p3j/pbuilderrc_m3iG --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Njfp9p3j/b2 --logfile b2/build.log --extrapackages usrmerge coccinelle_1.1.1.deb-2.dsc' SUDO_GID='117' SUDO_UID='110' SUDO_USER='jenkins' TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' + TZ='/usr/share/zoneinfo/Etc/GMT-14' USER='root' USERNAME='root' _='/usr/bin/systemd-run' http_proxy='http://192.168.101.16:3128' I: uname -a - Linux codethink12-arm64 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux + Linux i-capture-the-hostname 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Apr 8 22:26 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/17026/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 12 06:48 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -274,7 +283,7 @@ Get: 127 http://deb.debian.org/debian bookworm/main arm64 texlive-latex-recommended all 2022.20230122-2 [8880 kB] Get: 128 http://deb.debian.org/debian bookworm/main arm64 texlive-pictures all 2022.20230122-2 [15.8 MB] Get: 129 http://deb.debian.org/debian bookworm/main arm64 texlive-latex-extra all 2022.20230122-2 [19.2 MB] -Fetched 755 MB in 1min 18s (9641 kB/s) +Fetched 755 MB in 1min 21s (9349 kB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19616 files and directories currently installed.) @@ -825,8 +834,17 @@ Writing extended state information... Building tag database... -> Finished parsing the build-deps +Reading package lists... +Building dependency tree... +Reading state information... +usrmerge is already the newest version (35). +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/coccinelle-1.1.1.deb/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../coccinelle_1.1.1.deb-2_source.changes +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/A99_set_merged_usr finished +hostname: Temporary failure in name resolution +I: Running cd /build/coccinelle-1.1.1.deb/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../coccinelle_1.1.1.deb-2_source.changes dpkg-buildpackage: info: source package coccinelle dpkg-buildpackage: info: source version 1.1.1.deb-2 dpkg-buildpackage: info: source distribution unstable @@ -878,7 +896,7 @@ checking whether make supports nested variables... yes configure: determining version suffix checking for date... /usr/bin/date -configure: version suffix set to Tue, 11 Apr 2023 06:11:57 -1200 +configure: version suffix set to Tue, 14 May 2024 14:50:34 +1400 configure: this configure program uses pkg-config m4 macros configure: this configure program uses ocaml m4 macros (see setup/ocaml.m4) configure: this configure program uses custom m4 macros (see setup/cocci.m4) @@ -3713,24 +3731,24 @@ 25 states, 314 transitions, table size 1406 bytes OCAMLLEX parsing_cocci/lexer_cli.mll OCAMLLEX parsing_cocci/lexer_cocci.mll -14 states, 681 transitions, table size 2808 bytes OCAMLDEP tools/spgen/source/main.ml ocamllex warning: File "parsing_cocci/lexer_cocci.mll", line 301, character 67: unescaped newline in string. +14 states, 681 transitions, table size 2808 bytes OCAMLDEP tools/spgen/source/spgen_test.ml +OCAMLDEP tools/spgen/source/spgen.ml 143 states, 8123 transitions, table size 33350 bytes 23641 additional bytes used for bindings -OCAMLDEP tools/spgen/source/spgen.ml OCAMLDEP tools/spgen/source/spgen_config.ml OCAMLDEP tools/spgen/source/spgen_interactive.ml OCAMLDEP tools/spgen/source/file_transform.ml OCAMLDEP tools/spgen/source/script_rule.ml OCAMLDEP tools/spgen/source/context_rule.ml -400 states, 6934 transitions, table size 30136 bytes -4105 additional bytes used for bindings OCAMLDEP tools/spgen/source/rule_header.ml OCAMLDEP tools/spgen/source/rule_body.ml OCAMLDEP tools/spgen/source/disj_generator.ml +400 states, 6934 transitions, table size 30136 bytes +4105 additional bytes used for bindings OCAMLDEP tools/spgen/source/position_generator.ml OCAMLDEP tools/spgen/source/user_input.ml OCAMLDEP tools/spgen/source/snapshot.ml @@ -3763,9 +3781,9 @@ OCAMLDEP engine/pattern_c.ml OCAMLDEP engine/cocci_vs_c.ml OCAMLDEP engine/isomorphisms_c_c.ml -OCAMLDEP engine/c_vs_c.ml 564 states, 26650 transitions, table size 109984 bytes 17879 additional bytes used for bindings +OCAMLDEP engine/c_vs_c.ml OCAMLDEP engine/check_reachability.ml OCAMLDEP engine/check_exhaustive_pattern.ml OCAMLDEP engine/pretty_print_engine.ml @@ -3920,14 +3938,20 @@ cp parsing_c/flag_parsing_c.cmi ocaml/flag_parsing_c.cmi cp globals/iteration.cmi ocaml/iteration.cmi cp commons/commands.cmi ocaml/commands.cmi +cp commons/common.cmi ocaml/common.cmi cp commons/ocamlextra/dumper.cmi ocaml/dumper.cmi OCAMLC globals/regexp.ml OCAMLC globals/config.ml OCAMLC globals/flag.ml +OCAMLC parsing_c/flag_parsing_c.ml +OCAMLC globals/iteration.ml OCAMLC commons/commands.ml +OCAMLC commons/common.ml OCAMLC commons/ocamlextra/dumper.ml OCAMLOPT commons/ocamlextra/dumper.ml OCAMLOPT commons/commands.ml +OCAMLC commons/ograph_simple.mli +OCAMLC commons/ograph_extended.mli OCAMLOPT globals/config.ml OCAMLOPT globals/regexp_pcre.ml OCAMLOPT parsing_cocci/flag_parsing_cocci.ml @@ -3944,31 +3968,31 @@ OCAMLOPT ctl/flag_ctl.ml OCAMLOPT ctl/ast_ctl.ml OCAMLC ctl/pretty_print_ctl.mli +OCAMLC ctl/ctl_engine.mli OCAMLOPT engine/flag_matcher.ml OCAMLOPT popl09/flag_popl.ml OCAMLC extra/classic_patch.mli OCAMLC extra/kbuild.mli OCAMLC extra/maintainers.mli OCAMLOPT flag_cocci.ml +OCAMLC tools/spgen/source/globals.mli +OCAMLC tools/spgen/source/ast_tostring.mli OCAMLOPT tools/spgen/source/spgen_lexer.ml cp parsing_c/token_c.cmi ocaml/token_c.cmi -cp commons/common.cmi ocaml/common.cmi +cp parsing_cocci/ast_cocci.cmi ocaml/ast_cocci.cmi OCAMLC parsing_c/token_c.ml cp globals/regexp.cmo ocaml/regexp.cmo cp globals/config.cmo ocaml/config.cmo cp globals/flag.cmo ocaml/flag.cmo -OCAMLC parsing_c/flag_parsing_c.ml -OCAMLC globals/iteration.ml +cp parsing_c/flag_parsing_c.cmo ocaml/flag_parsing_c.cmo +cp globals/iteration.cmo ocaml/iteration.cmo cp commons/commands.cmo ocaml/commands.cmo -OCAMLC commons/common.ml OCAMLC parsing_cocci/ast_cocci.ml cp commons/ocamlextra/dumper.cmo ocaml/dumper.cmo cp globals/config.cmx ocaml/config.cmx cp commons/commands.cmx ocaml/commands.cmx cp commons/ocamlextra/dumper.cmx ocaml/dumper.cmx OCAMLOPT commons/common.ml -OCAMLC commons/ograph_simple.mli -OCAMLC commons/ograph_extended.mli OCAMLOPT globals/flag.ml OCAMLOPT globals/regexp.ml OCAMLC parsing_cocci/ast0_cocci.mli @@ -3983,22 +4007,17 @@ OCAMLC parsing_cocci/get_constants2.mli OCAMLC parsing_cocci/re_constraints.mli OCAMLC parsing_c/ast_c.mli -OCAMLC ctl/ctl_engine.mli +OCAMLC ctl/wrapper_ctl.mli OCAMLC ocaml/yes_prepare_ocamlcocci.mli OCAMLC ocaml/prepare_ocamlcocci.mli OCAMLC engine/check_exhaustive_pattern.mli OCAMLC popl09/ast_popl.mli OCAMLC testing.mli -OCAMLC tools/spgen/source/globals.mli -OCAMLC tools/spgen/source/ast_tostring.mli OCAMLC tools/spgen/source/detect_patch.mli OCAMLC tools/spgen/source/meta_variable.mli -OCAMLC tools/spgen/source/file_transform.mli -cp parsing_cocci/ast_cocci.cmi ocaml/ast_cocci.cmi cp parsing_cocci/ast0_cocci.cmi ocaml/ast0_cocci.cmi +OCAMLC tools/spgen/source/file_transform.mli cp parsing_c/token_c.cmo ocaml/token_c.cmo -cp parsing_c/flag_parsing_c.cmo ocaml/flag_parsing_c.cmo -cp globals/iteration.cmo ocaml/iteration.cmo OCAMLC parsing_cocci/ast0_cocci.ml cp globals/regexp.cmx ocaml/regexp.cmx cp globals/flag.cmx ocaml/flag.cmx @@ -4006,7 +4025,23 @@ OCAMLC parsing_cocci/ast0toast.mli OCAMLC parsing_cocci/unparse_ast0.mli OCAMLC parsing_cocci/unify_ast.mli +File "commons/common.ml", line 5305, characters 4-14: +5305 | write_file file1 (unwords xs); + ^^^^^^^^^^ +Warning 6 [labels-omitted]: label file was omitted in the application of this function. +File "commons/common.ml", line 5306, characters 4-14: +5306 | write_file file2 (unwords ys); + ^^^^^^^^^^ +Warning 6 [labels-omitted]: label file was omitted in the application of this function. OCAMLC parsing_cocci/compute_lines.mli +File "commons/common.ml", line 5333, characters 4-14: +5333 | write_file "/tmp/diff1" xstr; + ^^^^^^^^^^ +Warning 6 [labels-omitted]: label file was omitted in the application of this function. +File "commons/common.ml", line 5334, characters 4-14: +5334 | write_file "/tmp/diff2" ystr; + ^^^^^^^^^^ +Warning 6 [labels-omitted]: label file was omitted in the application of this function. OCAMLC parsing_cocci/comm_assoc.mli OCAMLC parsing_cocci/single_statement.mli OCAMLC parsing_cocci/simple_assignments.mli @@ -4039,30 +4074,16 @@ OCAMLC parsing_c/type_c.mli OCAMLC parsing_c/type_annoter_c.mli OCAMLC parsing_c/comment_annotater_c.mli -OCAMLC ctl/wrapper_ctl.mli OCAMLC ocaml/externalanalysis.mli OCAMLC ocaml/ocamlcocci_aux.mli -File "commons/common.ml", line 5305, characters 4-14: -5305 | write_file file1 (unwords xs); - ^^^^^^^^^^ -Warning 6 [labels-omitted]: label file was omitted in the application of this function. -File "commons/common.ml", line 5306, characters 4-14: -5306 | write_file file2 (unwords ys); - ^^^^^^^^^^ -Warning 6 [labels-omitted]: label file was omitted in the application of this function. -File "commons/common.ml", line 5333, characters 4-14: -5333 | write_file "/tmp/diff1" xstr; - ^^^^^^^^^^ -Warning 6 [labels-omitted]: label file was omitted in the application of this function. -File "commons/common.ml", line 5334, characters 4-14: -5334 | write_file "/tmp/diff2" ystr; - ^^^^^^^^^^ -Warning 6 [labels-omitted]: label file was omitted in the application of this function. OCAMLC ocaml/run_ocamlcocci.mli OCAMLC python/pycocci_aux.mli OCAMLC python/pycocci.mli +OCAMLC engine/lib_engine.mli +OCAMLC engine/check_reachability.mli OCAMLC engine/c_vs_c.mli OCAMLC engine/isomorphisms_c_c.mli +OCAMLC engine/cocci_vs_c.mli File "commons/common.ml", line 5305, characters 4-14: 5305 | write_file file1 (unwords xs); ^^^^^^^^^^ @@ -4071,6 +4092,7 @@ 5306 | write_file file2 (unwords ys); ^^^^^^^^^^ Warning 6 [labels-omitted]: label file was omitted in the application of this function. +OCAMLC popl09/asttopopl.mli File "commons/common.ml", line 5333, characters 4-14: 5333 | write_file "/tmp/diff1" xstr; ^^^^^^^^^^ @@ -4079,8 +4101,6 @@ 5334 | write_file "/tmp/diff2" ystr; ^^^^^^^^^^ Warning 6 [labels-omitted]: label file was omitted in the application of this function. -OCAMLC engine/cocci_vs_c.mli -OCAMLC popl09/asttopopl.mli OCAMLC popl09/insert_quantifiers.mli OCAMLC popl09/pretty_print_popl.mli OCAMLC tools/spgen/source/snapshot.mli @@ -4104,8 +4124,14 @@ OCAMLC parsing_c/token_helpers.mli OCAMLC parsing_c/token_views_c.mli OCAMLC parsing_c/parsing_recovery_c.mli -OCAMLC engine/lib_engine.mli -OCAMLC engine/check_reachability.mli +OCAMLC engine/pretty_print_engine.mli +OCAMLC engine/pattern_c.mli +OCAMLC engine/transformation_c.mli +OCAMLC engine/asttomember.mli +OCAMLC engine/asttoctl2.mli +OCAMLC engine/ctltotex.mli +OCAMLC engine/postprocess_transinfo.mli +OCAMLC engine/ctlcocci_integration.mli OCAMLC tools/spgen/source/position_generator.mli OCAMLC tools/spgen/source/disj_generator.mli OCAMLC tools/spgen/source/script_rule.mli @@ -4116,30 +4142,21 @@ cp parsing_c/visitor_c.cmi ocaml/visitor_c.cmi OCAMLC parsing_c/lexer_c.ml OCAMLC parsing_c/visitor_c.ml +cp commons/common.cmo ocaml/common.cmo OCAMLC parsing_cocci/iso_compile.mli MENHIR parsing_cocci/parser_cocci_menhir.mly OCAMLC parsing_c/lib_parsing_c.mli OCAMLC parsing_c/cpp_token_c.mli -OCAMLC engine/pretty_print_engine.mli -OCAMLC engine/pattern_c.mli -OCAMLC engine/transformation_c.mli -OCAMLC engine/asttomember.mli -OCAMLC engine/asttoctl2.mli -OCAMLC engine/ctltotex.mli -OCAMLC engine/postprocess_transinfo.mli -OCAMLC engine/ctlcocci_integration.mli OCAMLC popl09/popltoctl.mli OCAMLC popl09/popl.mli +OCAMLC parsing_c/parsing_hacks.mli +OCAMLC parsing_c/cpp_analysis_c.mli +OCAMLC parsing_c/parse_c.mli cp parsing_c/lib_parsing_c.cmi ocaml/lib_parsing_c.cmi cp parsing_c/ast_c.cmo ocaml/ast_c.cmo OCAMLC parsing_c/parser_c.ml OCAMLC parsing_c/pretty_print_c.ml OCAMLC parsing_c/lib_parsing_c.ml -cp commons/common.cmo ocaml/common.cmo -OCAMLC parsing_c/parsing_hacks.mli -OCAMLC parsing_c/cpp_analysis_c.mli -OCAMLC parsing_c/parse_c.mli -cp parsing_c/lib_parsing_c.cmo ocaml/lib_parsing_c.cmo OCAMLC parsing_c/unparse_c.mli OCAMLC parsing_c/cpp_ast_c.mli OCAMLC ocaml/exposed_modules.mli @@ -4147,6 +4164,13 @@ OCAMLC cocci.mli cp parsing_c/parse_c.cmi ocaml/parse_c.cmi OCAMLC parsing_c/parse_c.ml +cp parsing_c/lexer_c.cmo ocaml/lexer_c.cmo +cp parsing_c/lib_parsing_c.cmo ocaml/lib_parsing_c.cmo +cp parsing_c/visitor_c.cmo ocaml/visitor_c.cmo +File "parsing_c/parse_c.ml", line 680, characters 1-37: +680 | Parsing_recovery_c.find_next_synchro tr.rest tr.passed in + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Warning 6 [labels-omitted]: labels next, already_passed were omitted in the application of this function. File "parsing_c/pretty_print_c.ml", line 1626, characters 3-13: 1626 | (pp_elem_sp pr_elem pr_space).expression ^^^^^^^^^^ @@ -4235,13 +4259,6 @@ 1689 | (pp_elem_sp pr_elem pr_space).toplevel ^^^^^^^^^^ Warning 6 [labels-omitted]: labels pr_elem, pr_space were omitted in the application of this function. -cp parsing_c/lexer_c.cmo ocaml/lexer_c.cmo -cp parsing_c/visitor_c.cmo ocaml/visitor_c.cmo -File "parsing_c/parse_c.ml", line 680, characters 1-37: -680 | Parsing_recovery_c.find_next_synchro tr.rest tr.passed in - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Warning 6 [labels-omitted]: labels next, already_passed were omitted in the application of this function. -cp parsing_c/pretty_print_c.cmo ocaml/pretty_print_c.cmo File "parsing_c/parse_c.ml", line 1429, characters 2-19: 1429 | Common.write_file tmpfile ("void main() { \n" ^ s ^ "\n}"); ^^^^^^^^^^^^^^^^^ @@ -4250,9 +4267,9 @@ 1440 | Common.write_file tmpfile ("void main() { \n" ^ s ^ ";\n}"); ^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: label file was omitted in the application of this function. +cp parsing_c/pretty_print_c.cmo ocaml/pretty_print_c.cmo cp parsing_c/parse_c.cmo ocaml/parse_c.cmo cp parsing_c/parser_c.cmo ocaml/parser_c.cmo -OCAMLC python/yes_pycocci.mli OCAMLOPT commons/ograph_simple.ml OCAMLOPT commons/ograph_extended.ml OCAMLOPT globals/iteration.ml @@ -4266,6 +4283,7 @@ OCAMLOPT parsing_c/token_c.ml OCAMLOPT parsing_c/semantic_c.ml OCAMLOPT ctl/pretty_print_ctl.ml +OCAMLC python/yes_pycocci.mli OCAMLOPT extra/classic_patch.ml OCAMLOPT extra/kbuild.ml OCAMLOPT extra/maintainers.ml @@ -4277,7 +4295,6 @@ OCAMLOPT -o commons/commons.cmxa OCAMLOPT -o globals/globals.cmxa OCAMLOPT ctl/ctl_engine.ml -OCAMLOPT -o extra/extra.cmxa OCAMLOPT parsing_cocci/ast0_cocci.ml OCAMLOPT parsing_cocci/pretty_print_cocci.ml OCAMLOPT parsing_c/ast_c.ml @@ -4286,14 +4303,7 @@ OCAMLOPT tools/spgen/source/ast_tostring.ml cp parsing_cocci/ast_cocci.cmx ocaml/ast_cocci.cmx OCAMLOPT popl09/insert_quantifiers.ml -OCAMLOPT parsing_c/includes.ml -OCAMLOPT parsing_c/control_flow_c.ml -OCAMLOPT parsing_c/lexer_parser.ml -OCAMLOPT parsing_c/type_c.ml -OCAMLOPT ocaml/externalanalysis.ml -OCAMLOPT engine/isomorphisms_c_c.ml -cp parsing_c/ast_c.cmx ocaml/ast_c.cmx -cp parsing_cocci/ast0_cocci.cmx ocaml/ast0_cocci.cmx +OCAMLOPT -o extra/extra.cmxa OCAMLOPT parsing_cocci/visitor_ast0_types.ml OCAMLOPT parsing_cocci/visitor_ast.ml OCAMLOPT parsing_cocci/compute_lines.ml @@ -4301,11 +4311,19 @@ OCAMLOPT parsing_cocci/arity.ml OCAMLOPT parsing_cocci/index.ml OCAMLOPT parsing_cocci/data.ml -OCAMLOPT parsing_c/visitor_c.ml -OCAMLOPT engine/check_exhaustive_pattern.ml +OCAMLOPT parsing_c/includes.ml +OCAMLOPT parsing_c/control_flow_c.ml +OCAMLOPT parsing_c/lexer_parser.ml +OCAMLOPT parsing_c/type_c.ml +OCAMLOPT ocaml/externalanalysis.ml +OCAMLOPT engine/isomorphisms_c_c.ml OCAMLOPT popl09/asttopopl.ml OCAMLOPT popl09/pretty_print_popl.ml +cp parsing_c/ast_c.cmx ocaml/ast_c.cmx +cp parsing_cocci/ast0_cocci.cmx ocaml/ast0_cocci.cmx OCAMLOPT parsing_cocci/visitor_ast0.ml +OCAMLOPT parsing_c/visitor_c.ml +OCAMLOPT engine/check_exhaustive_pattern.ml OCAMLOPT ctl/wrapper_ctl.ml OCAMLOPT -o ctl/ctl.cmxa OCAMLOPT engine/lib_engine.ml @@ -4320,6 +4338,10 @@ OCAMLOPT parsing_c/danger.ml OCAMLOPT engine/c_vs_c.ml cp parsing_c/lib_parsing_c.cmx ocaml/lib_parsing_c.cmx +OCAMLOPT parsing_cocci/stmtlist.ml +OCAMLOPT parsing_cocci/free_vars.ml +OCAMLOPT parsing_cocci/safe_for_multi_decls.ml +OCAMLOPT parsing_cocci/cleanup_rules.ml File "parsing_c/pretty_print_c.ml", line 1626, characters 3-13: 1626 | (pp_elem_sp pr_elem pr_space).expression ^^^^^^^^^^ @@ -4408,35 +4430,39 @@ 1689 | (pp_elem_sp pr_elem pr_space).toplevel ^^^^^^^^^^ Warning 6 [labels-omitted]: labels pr_elem, pr_space were omitted in the application of this function. +OCAMLOPT parsing_cocci/disjdistr.ml +OCAMLOPT parsing_cocci/get_constants2.ml +OCAMLOPT parsing_cocci/re_constraints.ml +OCAMLOPT engine/asttomember.ml OCAMLOPT parsing_c/parser_c.ml OCAMLOPT parsing_c/unparse_cocci.ml OCAMLOPT ocaml/ocamlcocci_aux.ml -OCAMLOPT python/pycocci_aux.ml -OCAMLOPT engine/pretty_print_engine.ml -cp parsing_c/pretty_print_c.cmx ocaml/pretty_print_c.cmx File "parsing_c/unparse_cocci.ml", line 91, characters 2-35: 91 | Pretty_print_c.mk_pretty_printers pr_celem pr_cspace ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: labels pr_elem, pr_space, pr_nl, pr_indent, pr_outdent, pr_unindent were omitted in the application of this function. -OCAMLOPT parsing_cocci/stmtlist.ml -OCAMLOPT parsing_cocci/free_vars.ml -OCAMLOPT parsing_cocci/safe_for_multi_decls.ml -OCAMLOPT parsing_cocci/cleanup_rules.ml -OCAMLOPT parsing_cocci/disjdistr.ml +OCAMLOPT python/pycocci_aux.ml +OCAMLOPT engine/pretty_print_engine.ml +OCAMLOPT tools/spgen/source/detect_patch.ml +cp parsing_c/pretty_print_c.cmx ocaml/pretty_print_c.cmx +OCAMLOPT parsing_cocci/ast0toast.ml +OCAMLOPT parsing_cocci/iso_compile.ml +OCAMLOPT parsing_cocci/simple_assignments.ml +OCAMLOPT parsing_cocci/get_metas.ml +OCAMLOPT parsing_cocci/check_meta.ml File "parsing_c/unparse_cocci.ml", line 70, characters 4-22: 70 | let print_option_space fn = function ^^^^^^^^^^^^^^^^^^ Warning 26 [unused-var]: unused variable print_option_space. -OCAMLOPT parsing_cocci/get_constants2.ml -OCAMLOPT parsing_cocci/re_constraints.ml -OCAMLOPT engine/asttomember.ml -OCAMLOPT engine/asttoctl2.ml +OCAMLOPT parsing_cocci/test_exps.ml +OCAMLOPT parsing_cocci/unitary_ast0.ml +OCAMLOPT parsing_cocci/adjust_pragmas.ml OCAMLOPT parsing_cocci/id_utils.ml +OCAMLOPT parsing_cocci/adjacency.ml +OCAMLOPT parsing_cocci/commas_on_lists.ml OCAMLOPT parsing_c/unparse_hrule.ml -OCAMLOPT parsing_cocci/ast0toast.ml -OCAMLOPT parsing_cocci/iso_compile.ml -OCAMLOPT parsing_cocci/simple_assignments.ml -OCAMLOPT parsing_cocci/get_metas.ml +OCAMLOPT engine/asttoctl2.ml +OCAMLOPT tools/spgen/source/snapshot.ml File "parsing_c/unparse_hrule.ml", line 202, characters 6-33: 202 | Pretty_print_c.pp_param_gen ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -4445,64 +4471,58 @@ 340 | Pretty_print_c.pp_type_gen ^^^^^^^^^^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: labels pr_elem, pr_space were omitted in the application of this function. -OCAMLOPT parsing_cocci/check_meta.ml -OCAMLOPT parsing_cocci/test_exps.ml -OCAMLOPT parsing_cocci/unitary_ast0.ml -OCAMLOPT parsing_cocci/adjust_pragmas.ml -OCAMLOPT parsing_cocci/adjacency.ml -OCAMLOPT parsing_cocci/commas_on_lists.ml -OCAMLOPT parsing_c/lexer_c.ml -OCAMLOPT parsing_c/parse_string_c.ml -OCAMLOPT parsing_c/token_helpers.ml -OCAMLOPT tools/spgen/source/detect_patch.ml -cp parsing_c/parser_c.cmx ocaml/parser_c.cmx -OCAMLOPT tools/spgen/source/snapshot.ml File "tools/spgen/source/snapshot.ml", line 130, characters 37-53: 130 | let inc_line snp = inc_current_line (set_mode_context Ast0.NONE snp) ^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: label arity was omitted in the application of this function. OCAMLOPT tools/spgen/source/position_generator.ml -OCAMLOPT parsing_c/token_views_c.ml -OCAMLOPT parsing_c/parsing_recovery_c.ml -OCAMLOPT parsing_c/unparse_c.ml -OCAMLOPT parsing_c/comment_annotater_c.ml -cp parsing_c/lexer_c.cmx ocaml/lexer_c.cmx +OCAMLOPT parsing_c/lexer_c.ml +OCAMLOPT parsing_c/parse_string_c.ml +OCAMLOPT parsing_c/token_helpers.ml +cp parsing_c/parser_c.cmx ocaml/parser_c.cmx OCAMLOPT parsing_cocci/unparse_ast0.ml OCAMLOPT parsing_cocci/unify_ast.ml OCAMLOPT parsing_cocci/type_infer.ml -File "parsing_c/unparse_c.ml", line 275, characters 2-31: -275 | Pretty_print_c.pp_program_gen pr_get_elem pr_space celem; - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Warning 6 [labels-omitted]: labels pr_elem, pr_space were omitted in the application of this function. OCAMLOPT tools/spgen/source/meta_variable.ml -OCAMLOPT parsing_c/cpp_token_c.ml +OCAMLOPT parsing_c/token_views_c.ml +OCAMLOPT parsing_c/parsing_recovery_c.ml +OCAMLOPT parsing_c/unparse_c.ml File "tools/spgen/source/meta_variable.ml", line 568, characters 25-36: 568 | let constr = constraints rn idconstr in ^^^^^^^^^^^ Warning 6 [labels-omitted]: label rn was omitted in the application of this function. +OCAMLOPT parsing_c/comment_annotater_c.ml OCAMLOPT tools/spgen/source/disj_generator.ml -OCAMLOPT tools/spgen/source/user_input.ml -OCAMLOPT tools/spgen/source/rule_header.ml +cp parsing_c/lexer_c.cmx ocaml/lexer_c.cmx OCAMLOPT parsing_cocci/comm_assoc.ml +File "parsing_c/unparse_c.ml", line 275, characters 2-31: +275 | Pretty_print_c.pp_program_gen pr_get_elem pr_space celem; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Warning 6 [labels-omitted]: labels pr_elem, pr_space were omitted in the application of this function. OCAMLOPT parsing_cocci/context_neg.ml -OCAMLOPT parsing_c/parsing_hacks.ml +OCAMLOPT parsing_c/cpp_token_c.ml +OCAMLOPT parsing_cocci/iso_pattern.ml +OCAMLOPT parsing_cocci/parse_aux.ml OCAMLOPT tools/spgen/source/rule_body.ml +OCAMLOPT tools/spgen/source/rule_header.ml +OCAMLOPT parsing_c/parsing_hacks.ml +OCAMLOPT tools/spgen/source/user_input.ml +OCAMLOPT tools/spgen/source/context_rule.ml OCAMLOPT tools/spgen/source/script_rule.ml OCAMLOPT tools/spgen/source/file_transform.ml OCAMLOPT tools/spgen/source/spgen_interactive.ml OCAMLOPT tools/spgen/source/spgen_config.ml -OCAMLOPT parsing_cocci/iso_pattern.ml -OCAMLOPT parsing_cocci/parse_aux.ml OCAMLOPT popl09/popltoctl.ml -OCAMLOPT tools/spgen/source/context_rule.ml OCAMLOPT popl09/popl.ml OCAMLOPT -o popl09/popl09.cmxa +OCAMLOPT parsing_cocci/insert_plus.ml OCAMLOPT parsing_c/cpp_analysis_c.ml OCAMLOPT parsing_c/parse_c.ml File "parsing_c/parse_c.ml", line 680, characters 1-37: 680 | Parsing_recovery_c.find_next_synchro tr.rest tr.passed in ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: labels next, already_passed were omitted in the application of this function. +OCAMLOPT parsing_cocci/single_statement.ml File "parsing_c/parse_c.ml", line 1429, characters 2-19: 1429 | Common.write_file tmpfile ("void main() { \n" ^ s ^ "\n}"); ^^^^^^^^^^^^^^^^^ @@ -4511,12 +4531,12 @@ 1440 | Common.write_file tmpfile ("void main() { \n" ^ s ^ ";\n}"); ^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: label file was omitted in the application of this function. -OCAMLOPT parsing_cocci/insert_plus.ml +OCAMLOPT parsing_cocci/function_prototypes.ml OCAMLOPT parsing_c/cpp_ast_c.ml OCAMLOPT parsing_c/type_annoter_c.ml +OCAMLOPT parsing_c/compare_c.ml OCAMLOPT ocaml/exposed_modules.ml cp parsing_c/parse_c.cmx ocaml/parse_c.cmx -OCAMLOPT parsing_c/compare_c.ml OCAMLOPT parsing_c/test_parsing_c.ml OCAMLOPT ocaml/coccilib.ml File "ocaml/coccilib.ml", line 116, characters 2-19: @@ -4528,17 +4548,15 @@ ^^^^^^^^^^^^^^^^^ Warning 6 [labels-omitted]: label file was omitted in the application of this function. OCAMLOPT -o parsing_c/parsing_c.cmxa -OCAMLOPT parsing_cocci/single_statement.ml -OCAMLOPT parsing_cocci/function_prototypes.ml OCAMLOPT ocaml/yes_prepare_ocamlcocci.ml OCAMLOPT ocaml/run_ocamlcocci.ml OCAMLOPT python/yes_pycocci.ml -OCAMLOPT ocaml/prepare_ocamlcocci.ml OCAMLOPT python/pycocci.ml -OCAMLOPT -o ocaml/ocaml.cmxa OCAMLOPT -o python/python.cmxa OCAMLOPT engine/cocci_vs_c.ml OCAMLOPT engine/postprocess_transinfo.ml +OCAMLOPT ocaml/prepare_ocamlcocci.ml +OCAMLOPT -o ocaml/ocaml.cmxa OCAMLDEP parsing_cocci/parser_cocci_menhir.ml OCAMLDEP parsing_cocci/parser_cocci_menhir.mli OCAMLC parsing_cocci/parser_cocci_menhir.mli @@ -4547,8 +4565,8 @@ OCAMLOPT engine/pattern_c.ml OCAMLOPT engine/transformation_c.ml OCAMLOPT engine/ctlcocci_integration.ml -OCAMLOPT -o engine/engine.cmxa OCAMLOPT parsing_cocci/parser_cocci_menhir.ml +OCAMLOPT -o engine/engine.cmxa OCAMLOPT parsing_cocci/lexer_cocci.ml OCAMLOPT parsing_cocci/lexer_script.ml OCAMLOPT parsing_cocci/parse_cocci.ml @@ -4580,7 +4598,7 @@ 62.res diff = --- tests/62.c -+++ /tmp/cocci-output-13306-55dfbf-62.c ++++ /tmp/cocci-output-6548-79951e-62.c @@ -1,8 +1,12 @@ static struct usb_driver carl9170_driver = { .id_table = carl9170_usb_ids, @@ -4598,7 +4616,7 @@ a3d.res diff = --- tests/a3d.c -+++ /tmp/cocci-output-13306-4cf5e6-a3d.c ++++ /tmp/cocci-output-6548-6b3a6d-a3d.c @@ -6,13 +6,13 @@ struct a3d { static void a3d_connect(struct gameport *gameport, struct gameport_dev *dev) { @@ -4620,7 +4638,7 @@ a_and_e_ver1.res diff = --- tests/a_and_e_ver1.c -+++ /tmp/cocci-output-13306-58555b-a_and_e_ver1.c ++++ /tmp/cocci-output-6548-d27410-a_and_e_ver1.c @@ -1,6 +1,7 @@ void main(int i) { @@ -4633,7 +4651,7 @@ warning: line 4: should a be a metavariable? diff = --- tests/ab.c -+++ /tmp/cocci-output-13306-00cb39-ab.c ++++ /tmp/cocci-output-6548-c02859-ab.c @@ -1,5 +1,5 @@ int main () { foo = 5; @@ -4644,7 +4662,7 @@ action.res diff = --- tests/action.c -+++ /tmp/cocci-output-13306-052b25-action.c ++++ /tmp/cocci-output-6548-2cb992-action.c @@ -1,10 +1,9 @@ void work() { @@ -4662,7 +4680,7 @@ add1.res diff = --- tests/add1.c -+++ /tmp/cocci-output-13306-8a062a-add1.c ++++ /tmp/cocci-output-6548-53528c-add1.c @@ -7,6 +7,9 @@ static int create_scheduling_groups(void ret = build_groups(sd, i); } @@ -4676,7 +4694,7 @@ addaft.res diff = --- tests/addaft.c -+++ /tmp/cocci-output-13306-9db03b-addaft.c ++++ /tmp/cocci-output-6548-725e60-addaft.c @@ -1,16 +1,8 @@ int main () { foo(); @@ -4700,7 +4718,7 @@ addbefore.res diff = --- tests/addbefore.c -+++ /tmp/cocci-output-13306-3499d7-addbefore.c ++++ /tmp/cocci-output-6548-232c59-addbefore.c @@ -1,5 +1,6 @@ int main () { if (x) { @@ -4711,7 +4729,7 @@ addbeforeafter.res diff = --- tests/addbeforeafter.c -+++ /tmp/cocci-output-13306-573c13-addbeforeafter.c ++++ /tmp/cocci-output-6548-7c931f-addbeforeafter.c @@ -1,6 +1,8 @@ int main () { if (x) { @@ -4724,7 +4742,7 @@ addelse.res diff = --- tests/addelse.c -+++ /tmp/cocci-output-13306-16ecf1-addelse.c ++++ /tmp/cocci-output-6548-098f24-addelse.c @@ -1,3 +1,2 @@ int main () { - if (x == 12) return 6; @@ -4732,7 +4750,7 @@ addes.res diff = --- tests/addes.c -+++ /tmp/cocci-output-13306-4578e2-addes.c ++++ /tmp/cocci-output-6548-615bbf-addes.c @@ -1 +1,3 @@ int i; +struct foo { @@ -4740,7 +4758,7 @@ addfield.res diff = --- tests/addfield.c -+++ /tmp/cocci-output-13306-b23b05-addfield.c ++++ /tmp/cocci-output-6548-88f7ef-addfield.c @@ -1,4 +1,6 @@ struct i2c_client I = { - .name = E, @@ -4752,7 +4770,7 @@ addfield2.res diff = --- tests/addfield2.c -+++ /tmp/cocci-output-13306-53e398-addfield2.c ++++ /tmp/cocci-output-6548-d1352e-addfield2.c @@ -1,17 +1,21 @@ struct foo { + int roto; @@ -4778,7 +4796,7 @@ addif.res diff = --- tests/addif.c -+++ /tmp/cocci-output-13306-0a60fd-addif.c ++++ /tmp/cocci-output-6548-e8befc-addif.c @@ -1,7 +1,19 @@ +#ifdef FOO +/* some comment */ @@ -4802,7 +4820,7 @@ addif1.res diff = --- tests/addif1.c -+++ /tmp/cocci-output-13306-27c885-addif1.c ++++ /tmp/cocci-output-6548-6cf00d-addif1.c @@ -1,7 +1,15 @@ +#ifdef FOO +int xxx() { @@ -4822,7 +4840,7 @@ addif2.res diff = --- tests/addif2.c -+++ /tmp/cocci-output-13306-2e5e16-addif2.c ++++ /tmp/cocci-output-6548-1f83d7-addif2.c @@ -1,7 +1,13 @@ +#ifdef FOO +int/*foo*/ xxx; @@ -4840,7 +4858,7 @@ addifdef.res diff = --- tests/addifdef.c -+++ /tmp/cocci-output-13306-1084b9-addifdef.c ++++ /tmp/cocci-output-6548-ef62b7-addifdef.c @@ -1,10 +1,14 @@ #ifdef FOO +#ifdef LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) @@ -4859,7 +4877,7 @@ addifelse.res diff = --- tests/addifelse.c -+++ /tmp/cocci-output-13306-b56f8c-addifelse.c ++++ /tmp/cocci-output-6548-0b54c7-addifelse.c @@ -1,8 +1,14 @@ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) static void rfcomm_l2data_ready(struct sock *sk) @@ -4878,7 +4896,7 @@ addifelse2.res diff = --- tests/addifelse2.c -+++ /tmp/cocci-output-13306-af5fb9-addifelse2.c ++++ /tmp/cocci-output-6548-3b3880-addifelse2.c @@ -1,8 +1,15 @@ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) +static void backport_rfcomm_l2data_ready(struct sock *sk, int unused){ @@ -4898,7 +4916,7 @@ addinc.res diff = --- tests/addinc.c -+++ /tmp/cocci-output-13306-9408aa-addinc.c ++++ /tmp/cocci-output-6548-c192a4-addinc.c @@ -1,4 +1,5 @@ #ifndef FOO #define FOO @@ -4908,7 +4926,7 @@ addtoo.res diff = --- tests/addtoo.c -+++ /tmp/cocci-output-13306-cbb49c-addtoo.c ++++ /tmp/cocci-output-6548-4fd654-addtoo.c @@ -1,16 +1,8 @@ int main () { - if (x) { @@ -4932,7 +4950,7 @@ addtrace.res diff = --- tests/addtrace.c -+++ /tmp/cocci-output-13306-3961f0-addtrace.c ++++ /tmp/cocci-output-6548-f4f77c-addtrace.c @@ -2,13 +2,24 @@ short VerDate(char *pcDate) { short sRetour = 0; @@ -4965,7 +4983,7 @@ after_if.res diff = --- tests/after_if.c -+++ /tmp/cocci-output-13306-29dfa9-after_if.c ++++ /tmp/cocci-output-6548-a9a7e2-after_if.c @@ -1,4 +1,5 @@ #ifdef ELMC_MULTICAST static void set_multicast_list(struct net_device *dev); @@ -4976,7 +4994,7 @@ allex.res diff = --- tests/allex.c -+++ /tmp/cocci-output-13306-85e1cb-allex.c ++++ /tmp/cocci-output-6548-e583e1-allex.c @@ -6,7 +6,7 @@ int main () { goto out; } @@ -4989,7 +5007,7 @@ allex2.res diff = --- tests/allex2.c -+++ /tmp/cocci-output-13306-b3e48b-allex2.c ++++ /tmp/cocci-output-6548-2e8559-allex2.c @@ -8,5 +8,5 @@ int main () { } return 15; @@ -5000,7 +5018,7 @@ allex3.res diff = --- tests/allex3.c -+++ /tmp/cocci-output-13306-a7406c-allex3.c ++++ /tmp/cocci-output-6548-ac550a-allex3.c @@ -9,5 +9,4 @@ int main () { } return 15; @@ -5010,7 +5028,7 @@ andid.res diff = --- tests/andid.c -+++ /tmp/cocci-output-13306-51684c-andid.c ++++ /tmp/cocci-output-6548-010603-andid.c @@ -1,5 +1,5 @@ int main () { - int frontandback = 12; @@ -5021,7 +5039,7 @@ anon.res diff = --- tests/anon.c -+++ /tmp/cocci-output-13306-ee7cbc-anon.c ++++ /tmp/cocci-output-6548-744ce0-anon.c @@ -12,5 +12,5 @@ static int ppa_queuecommand(struct scsi_ void (*done) (struct scsi_cmnd *)) { @@ -5032,7 +5050,7 @@ anonfield.res diff = --- tests/anonfield.c -+++ /tmp/cocci-output-13306-b9e17a-anonfield.c ++++ /tmp/cocci-output-6548-c2286c-anonfield.c @@ -1,3 +1,3 @@ struct { - int; @@ -5041,7 +5059,7 @@ ar.res diff = --- tests/ar.c -+++ /tmp/cocci-output-13306-7238ad-ar.c ++++ /tmp/cocci-output-6548-b349c1-ar.c @@ -4,9 +4,4 @@ int main() { struct foo *x; struct bar *y; @@ -5055,7 +5073,7 @@ arg.res diff = --- tests/arg.c -+++ /tmp/cocci-output-13306-e7bc9b-arg.c ++++ /tmp/cocci-output-6548-468883-arg.c @@ -1,6 +1,6 @@ int main () { - foo(bar()); @@ -5070,7 +5088,7 @@ argument.res diff = --- tests/argument.c -+++ /tmp/cocci-output-13306-34ba05-argument.c ++++ /tmp/cocci-output-6548-669f2a-argument.c @@ -1,8 +1,5 @@ void main(int i){ @@ -5084,7 +5102,7 @@ arparam.res diff = --- tests/arparam.c -+++ /tmp/cocci-output-13306-a82a35-arparam.c ++++ /tmp/cocci-output-6548-50870e-arparam.c @@ -1,3 +1,8 @@ +int g(int q[1024]) +{ @@ -5097,7 +5115,7 @@ array_init.res diff = --- tests/array_init.c -+++ /tmp/cocci-output-13306-ab0fc7-array_init.c ++++ /tmp/cocci-output-6548-415d95-array_init.c @@ -1,3 +1,2 @@ static int term[MAX_ECARDS] = { 1, 1, 1, 1, 1, 1, 1, 1 }; -MODULE_PARM(term, "1-8i"); @@ -5105,7 +5123,7 @@ array_size.res diff = --- tests/array_size.c -+++ /tmp/cocci-output-13306-2781ad-array_size.c ++++ /tmp/cocci-output-6548-c86090-array_size.c @@ -1,2 +1,2 @@ -#define MAX_SETUP_STRINGS (sizeof(setup_strings) / sizeof(char *)) +#define MAX_SETUP_STRINGS ARRAY_SIZE(setup_strings) @@ -5113,7 +5131,7 @@ arraysz.res diff = --- tests/arraysz.c -+++ /tmp/cocci-output-13306-69cb59-arraysz.c ++++ /tmp/cocci-output-6548-1a9f2a-arraysz.c @@ -7,4 +7,4 @@ typedef struct signature { static const Signature signatures[] = { {"SSTBIOS", 0x0000d, 7} /* "SSTBIOS" @ offset 0x0000d */ @@ -5123,7 +5141,7 @@ as_stm.res diff = --- tests/as_stm.c -+++ /tmp/cocci-output-13306-0031df-as_stm.c ++++ /tmp/cocci-output-6548-a33ed4-as_stm.c @@ -1,3 +1,5 @@ int main () { +#ifdef BEFORE @@ -5135,7 +5153,7 @@ warning: line 36: should id be a metavariable? diff = --- tests/attr_with_arguments.c -+++ /tmp/cocci-output-13306-cf0905-attr_with_arguments.c ++++ /tmp/cocci-output-6548-19451d-attr_with_arguments.c @@ -1,9 +1,9 @@ -aarg(1,2) int func() { - int id aarg3(1,2); @@ -5169,7 +5187,7 @@ attradd.res diff = --- tests/attradd.c -+++ /tmp/cocci-output-13306-25f0cd-attradd.c ++++ /tmp/cocci-output-6548-41f15f-attradd.c @@ -1,3 +1,3 @@ int main () { - char f; @@ -5178,7 +5196,7 @@ attrs2groups.res diff = --- tests/attrs2groups.c -+++ /tmp/cocci-output-13306-0375d8-attrs2groups.c ++++ /tmp/cocci-output-6548-fa4193-attrs2groups.c @@ -3,18 +3,24 @@ static ssize_t devspec_show(struct devic { return 42; @@ -5210,7 +5228,7 @@ b1.res diff = --- tests/b1.c -+++ /tmp/cocci-output-13306-4d535c-b1.c ++++ /tmp/cocci-output-6548-268a59-b1.c @@ -1,7 +1,9 @@ int main () { while (1) { @@ -5226,7 +5244,7 @@ b2.res diff = --- tests/b2.c -+++ /tmp/cocci-output-13306-dd0740-b2.c ++++ /tmp/cocci-output-6548-ab5e81-b2.c @@ -1,9 +1,11 @@ int main () { if (1) { @@ -5245,7 +5263,7 @@ bad_kfree.res diff = --- tests/bad_kfree.c -+++ /tmp/cocci-output-13306-84120c-bad_kfree.c ++++ /tmp/cocci-output-6548-36c7d1-bad_kfree.c @@ -14,7 +14,7 @@ int bad () { kfree(itv[i]); print("foo",itv[i]); @@ -5258,7 +5276,7 @@ bad_ptr_print.res diff = --- tests/bad_ptr_print.c -+++ /tmp/cocci-output-13306-4e76fd-bad_ptr_print.c ++++ /tmp/cocci-output-6548-775bf7-bad_ptr_print.c @@ -1,4 +1,4 @@ static inline int tester(struct usb_endpoint_descriptor *epd) { @@ -5268,7 +5286,7 @@ bad_typedef.res diff = --- tests/bad_typedef.c -+++ /tmp/cocci-output-13306-ad6378-bad_typedef.c ++++ /tmp/cocci-output-6548-ade48b-bad_typedef.c @@ -4,7 +4,7 @@ typedef struct { @@ -5288,7 +5306,7 @@ badcfg.res diff = --- tests/badcfg.c -+++ /tmp/cocci-output-13306-1dafef-badcfg.c ++++ /tmp/cocci-output-6548-49246d-badcfg.c @@ -3,7 +3,7 @@ const char *netdev_cmd_to_name(enum netd #define N(val) \ case NETDEV_##val: \ @@ -5301,7 +5319,7 @@ badexp.res diff = --- tests/badexp.c -+++ /tmp/cocci-output-13306-a7724a-badexp.c ++++ /tmp/cocci-output-6548-4f93ed-badexp.c @@ -1,4 +1,4 @@ int main() { foo(a); @@ -5328,7 +5346,7 @@ badtypedef.res diff = --- tests/badtypedef.c -+++ /tmp/cocci-output-13306-133de5-badtypedef.c ++++ /tmp/cocci-output-6548-45716b-badtypedef.c @@ -5,7 +5,7 @@ int main() { foo_t *b; foo_t *c; @@ -5342,7 +5360,7 @@ badwhen.res diff = --- tests/badwhen.c -+++ /tmp/cocci-output-13306-db391d-badwhen.c ++++ /tmp/cocci-output-6548-f78164-badwhen.c @@ -4,7 +4,5 @@ int main () { g(); } @@ -5354,7 +5372,7 @@ badzero.res diff = --- tests/badzero.c -+++ /tmp/cocci-output-13306-fabd1a-badzero.c ++++ /tmp/cocci-output-6548-1161cb-badzero.c @@ -4,7 +4,7 @@ int main () { int z; if (y - x == 0) return; @@ -5371,7 +5389,7 @@ befS.res diff = --- tests/befS.c -+++ /tmp/cocci-output-13306-3aafb1-befS.c ++++ /tmp/cocci-output-6548-1689ac-befS.c @@ -1,20 +1,32 @@ int main () { + foo(); @@ -5410,7 +5428,7 @@ before.res diff = --- tests/before.c -+++ /tmp/cocci-output-13306-214b09-before.c ++++ /tmp/cocci-output-6548-acaad8-before.c @@ -1,4 +1,6 @@ int main () { + blah(); @@ -5421,7 +5439,7 @@ ben.res diff = --- tests/ben.c -+++ /tmp/cocci-output-13306-0bca90-ben.c ++++ /tmp/cocci-output-6548-47b365-ben.c @@ -1,22 +1,20 @@ +static GType this_type = 0; +static const GTypeInfo this_info = { @@ -5461,7 +5479,7 @@ bigin.res diff = --- tests/bigin.c -+++ /tmp/cocci-output-13306-aba002-bigin.c ++++ /tmp/cocci-output-6548-4ac8a9-bigin.c @@ -9,5 +9,6 @@ int main() { if (x) if (x) @@ -5472,7 +5490,7 @@ bigrepl.res diff = --- tests/bigrepl.c -+++ /tmp/cocci-output-13306-f8631c-bigrepl.c ++++ /tmp/cocci-output-6548-67e7df-bigrepl.c @@ -1,6 +1,9 @@ int main () { - one(argument1(nested, argument), argument2(nested, argument), foo(), @@ -5489,7 +5507,7 @@ binop.res diff = --- tests/binop.c -+++ /tmp/cocci-output-13306-0488e2-binop.c ++++ /tmp/cocci-output-6548-73bf01-binop.c @@ -2,10 +2,12 @@ void main() { int i = 0; int j = 0; @@ -5509,7 +5527,7 @@ warning: rule starting on line 11: metavariable v not used in the - or context code diff = --- tests/bitfield.c -+++ /tmp/cocci-output-13306-2076fc-bitfield.c ++++ /tmp/cocci-output-6548-cd6d6f-bitfield.c @@ -1,15 +1,15 @@ struct dvb_frontend { - struct dvb_frontend_ops* ops; @@ -5541,7 +5559,7 @@ (ONCE) already tagged but only removed, so safe diff = --- tests/boolr.c -+++ /tmp/cocci-output-13306-52b2ba-boolr.c ++++ /tmp/cocci-output-6548-65e2a2-boolr.c @@ -1,4 +1,3 @@ int main() { - bool i3, i4, i5; @@ -5550,7 +5568,7 @@ bracebraceline.res diff = --- tests/bracebraceline.c -+++ /tmp/cocci-output-13306-98ca27-bracebraceline.c ++++ /tmp/cocci-output-6548-983326-bracebraceline.c @@ -1,6 +1,5 @@ int main () { if (x) { @@ -5562,7 +5580,7 @@ braceline.res diff = --- tests/braceline.c -+++ /tmp/cocci-output-13306-44ecf0-braceline.c ++++ /tmp/cocci-output-6548-6ac2cb-braceline.c @@ -1,6 +1,3 @@ int main () { - if (x) { @@ -5574,7 +5592,7 @@ braces.res diff = --- tests/braces.c -+++ /tmp/cocci-output-13306-e664bb-braces.c ++++ /tmp/cocci-output-6548-93b835-braces.c @@ -1,9 +1,9 @@ -#define main { foo(); } +#define main foo(); @@ -5592,7 +5610,7 @@ branchparen.res diff = --- tests/branchparen.c -+++ /tmp/cocci-output-13306-c03100-branchparen.c ++++ /tmp/cocci-output-6548-9cb9d4-branchparen.c @@ -1,6 +1,10 @@ int main () { - if (x) @@ -5609,7 +5627,7 @@ break.res diff = --- tests/break.c -+++ /tmp/cocci-output-13306-584035-break.c ++++ /tmp/cocci-output-6548-37dc49-break.c @@ -5,8 +5,10 @@ int main () { x = 15; if (x > 1 ) { foo(); break; } @@ -5635,7 +5653,7 @@ bug1.res diff = --- tests/bug1.c -+++ /tmp/cocci-output-13306-90110a-bug1.c ++++ /tmp/cocci-output-6548-83d536-bug1.c @@ -1,4 +1,5 @@ -static int typhoon_ioctl(struct video_device *dev, unsigned int cmd,void *arg) +static int typhoon_ioctl(struct inode *i, struct file *f, unsigned int cmd, @@ -5646,7 +5664,7 @@ bugloop.res diff = --- tests/bugloop.c -+++ /tmp/cocci-output-13306-b62e8d-bugloop.c ++++ /tmp/cocci-output-6548-bf9f3b-bugloop.c @@ -8,8 +8,8 @@ static int stir_transmit_thread(void *ar while (x) { @@ -5661,7 +5679,7 @@ bugon.res diff = --- tests/bugon.c -+++ /tmp/cocci-output-13306-0c3929-bugon.c ++++ /tmp/cocci-output-6548-fe28f0-bugon.c @@ -1,5 +1,4 @@ static void b44_tx(struct b44 *bp) { @@ -5672,7 +5690,7 @@ bus.res diff = --- tests/bus.c -+++ /tmp/cocci-output-13306-8d2c10-bus.c ++++ /tmp/cocci-output-6548-90471a-bus.c @@ -1,5 +1,5 @@ int main () { struct foo *dev; @@ -5684,7 +5702,7 @@ cards.res diff = --- tests/cards.c -+++ /tmp/cocci-output-13306-cd529b-cards.c ++++ /tmp/cocci-output-6548-52ed63-cards.c @@ -1,3 +1,3 @@ -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i"); + @@ -5693,7 +5711,7 @@ caseprint.res diff = --- tests/caseprint.c -+++ /tmp/cocci-output-13306-b1ec59-caseprint.c ++++ /tmp/cocci-output-6548-21a381-caseprint.c @@ -3,4 +3,10 @@ int f() { case 12: return 0; case 1: return 2; @@ -5708,7 +5726,7 @@ cast.res diff = --- tests/cast.c -+++ /tmp/cocci-output-13306-0b8d36-cast.c ++++ /tmp/cocci-output-6548-9a8b7d-cast.c @@ -1,3 +1,2 @@ int main () { - ((struct xxx *)E)->foo = 12; @@ -5716,7 +5734,7 @@ cast_iso.res diff = --- tests/cast_iso.c -+++ /tmp/cocci-output-13306-7caec1-cast_iso.c ++++ /tmp/cocci-output-6548-8468d4-cast_iso.c @@ -1,6 +1,6 @@ static int vx_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp) { @@ -5729,7 +5747,7 @@ castdecl.res diff = --- tests/castdecl.c -+++ /tmp/cocci-output-13306-e78017-castdecl.c ++++ /tmp/cocci-output-6548-8cf4f8-castdecl.c @@ -1,9 +1,9 @@ int main() { - long i1, i2; @@ -5748,7 +5766,7 @@ cex_wishlist_complex1.res diff = --- tests/cex_wishlist_complex1.c -+++ /tmp/cocci-output-13306-cd028a-cex_wishlist_complex1.c ++++ /tmp/cocci-output-6548-e6bbf6-cex_wishlist_complex1.c @@ -1,6 +1,6 @@ #include int main() { @@ -5760,7 +5778,7 @@ cex_wishlist_complex2.res diff = --- tests/cex_wishlist_complex2.c -+++ /tmp/cocci-output-13306-57841b-cex_wishlist_complex2.c ++++ /tmp/cocci-output-6548-7bbcbc-cex_wishlist_complex2.c @@ -2,7 +2,7 @@ int main() { double d; @@ -5773,7 +5791,7 @@ cex_wishlist_complex3.res diff = --- tests/cex_wishlist_complex3.c -+++ /tmp/cocci-output-13306-06347d-cex_wishlist_complex3.c ++++ /tmp/cocci-output-6548-6d5c0b-cex_wishlist_complex3.c @@ -2,7 +2,7 @@ int main() { double d; @@ -5787,7 +5805,7 @@ change.res diff = --- tests/change.c -+++ /tmp/cocci-output-13306-f749fb-change.c ++++ /tmp/cocci-output-6548-e06dcc-change.c @@ -1,5 +1,6 @@ int main () { foo(); @@ -5798,7 +5816,7 @@ change_type.res diff = --- tests/change_type.c -+++ /tmp/cocci-output-13306-fe70cf-change_type.c ++++ /tmp/cocci-output-6548-419d52-change_type.c @@ -1,4 +1,4 @@ int main () { struct foo *x; @@ -5808,7 +5826,7 @@ changei.res diff = --- tests/changei.c -+++ /tmp/cocci-output-13306-cf1260-changei.c ++++ /tmp/cocci-output-6548-6ca3c0-changei.c @@ -1,7 +1,7 @@ -typedef struct i istruct; +typedef struct i xxx; @@ -5824,7 +5842,7 @@ cocci_args.res diff = --- tests/cocci_args.c -+++ /tmp/cocci-output-13306-13b718-cocci_args.c ++++ /tmp/cocci-output-6548-3c9e80-cocci_args.c @@ -1,3 +1,3 @@ int main () { - f(); @@ -5833,7 +5851,7 @@ com.res diff = --- tests/com.c -+++ /tmp/cocci-output-13306-181fef-com.c ++++ /tmp/cocci-output-6548-91efe0-com.c @@ -1,8 +1,3 @@ int main() { - foo(); @@ -5846,7 +5864,7 @@ comadd.res diff = --- tests/comadd.c -+++ /tmp/cocci-output-13306-dfbb43-comadd.c ++++ /tmp/cocci-output-6548-1b7842-comadd.c @@ -1,3 +1,5 @@ +// some comment +// some other comment @@ -5856,7 +5874,7 @@ comj.res diff = --- tests/comj.c -+++ /tmp/cocci-output-13306-2bc210-comj.c ++++ /tmp/cocci-output-6548-ac8807-comj.c @@ -2,6 +2,8 @@ int foo(int bar) { int i, j; @@ -5868,12 +5886,12 @@ return j; comma.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_4ab696.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_4ab696.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_b9d6a2.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_b9d6a2.ml Compilation OK! Loading ML code of the SP... diff = --- tests/comma.c -+++ /tmp/cocci-output-13306-507a1f-comma.c ++++ /tmp/cocci-output-6548-054e57-comma.c @@ -3,9 +3,9 @@ show_cpuinfo (struct seq_file *m, void * { for (i = 0; i < ARRAY_SIZE(feature_bits) && size > 1; ++i) { @@ -5889,7 +5907,7 @@ comma_call.res diff = --- tests/comma_call.c -+++ /tmp/cocci-output-13306-8ebfee-comma_call.c ++++ /tmp/cocci-output-6548-7ce639-comma_call.c @@ -1,10 +1,13 @@ int main() { - if (x) @@ -5911,7 +5929,7 @@ comma_if.res diff = --- tests/comma_if.c -+++ /tmp/cocci-output-13306-6458b1-comma_if.c ++++ /tmp/cocci-output-6548-1c1f70-comma_if.c @@ -1,13 +1,19 @@ int main() { - if (uffdio_zeropage.zeropage == -EEXIST) @@ -5941,7 +5959,7 @@ comment_brace.res diff = --- tests/comment_brace.c -+++ /tmp/cocci-output-13306-9225c9-comment_brace.c ++++ /tmp/cocci-output-6548-a9a8bf-comment_brace.c @@ -1,7 +1,9 @@ int main () { @@ -5956,7 +5974,7 @@ comment_brace2.res diff = --- tests/comment_brace2.c -+++ /tmp/cocci-output-13306-afc448-comment_brace2.c ++++ /tmp/cocci-output-6548-b39918-comment_brace2.c @@ -1,7 +1,9 @@ int main () { @@ -5970,8 +5988,8 @@ comment_line.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_6cf76a.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_6cf76a.ml -File "/tmp/ocaml_cocci_6cf76a.ml", line 31, characters 4-5: +ocamlopt.opt -shared -o /tmp/ocaml_cocci_6c1ac0.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_6c1ac0.ml +File "/tmp/ocaml_cocci_6c1ac0.ml", line 31, characters 4-5: 31 | let p = match List.nth __args__ 1 with Coccilib.Pos x -> x | _ -> failwith "bad value" in ^ Warning 26 [unused-var]: unused variable p. @@ -5981,7 +5999,7 @@ 1 diff = --- tests/comment_line.c -+++ /tmp/cocci-output-13306-dce3c5-comment_line.c ++++ /tmp/cocci-output-6548-721805-comment_line.c @@ -1,11 +1,9 @@ int main() { before(); @@ -5996,8 +6014,8 @@ } comment_middle.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_97aabe.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_97aabe.ml -File "/tmp/ocaml_cocci_97aabe.ml", line 30, characters 5-6: +ocamlopt.opt -shared -o /tmp/ocaml_cocci_0903d4.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_0903d4.ml +File "/tmp/ocaml_cocci_0903d4.ml", line 30, characters 5-6: 30 | let f = match List.nth __args__ 0 with Coccilib.Str x -> x | _ -> failwith "bad value" in ^ Warning 26 [unused-var]: unused variable f. @@ -6005,7 +6023,7 @@ Loading ML code of the SP... diff = --- tests/comment_middle.c -+++ /tmp/cocci-output-13306-6febf7-comment_middle.c ++++ /tmp/cocci-output-6548-007831-comment_middle.c @@ -5,5 +5,4 @@ struct i { }; @@ -6015,7 +6033,7 @@ comments.res diff = --- tests/comments.c -+++ /tmp/cocci-output-13306-d46b56-comments.c ++++ /tmp/cocci-output-6548-ca8c9a-comments.c @@ -1,5 +1,16 @@ int main() { @@ -6036,7 +6054,7 @@ compare.res diff = --- tests/compare.c -+++ /tmp/cocci-output-13306-9c64ec-compare.c ++++ /tmp/cocci-output-6548-bf9123-compare.c @@ -1,7 +1,7 @@ struct aic7xxx_host { struct aic7xxx_cmd_queue { @@ -6050,7 +6068,7 @@ compare_const2.res diff = --- tests/compare_const2.c -+++ /tmp/cocci-output-13306-c5a368-compare_const2.c ++++ /tmp/cocci-output-6548-5e421f-compare_const2.c @@ -1,6 +1,6 @@ int main () { // int i,o; @@ -6063,7 +6081,7 @@ condexp.res diff = --- tests/condexp.c -+++ /tmp/cocci-output-13306-23ad1c-condexp.c ++++ /tmp/cocci-output-6548-2c7b5a-condexp.c @@ -5,7 +5,7 @@ main(int argc, char *argv[]) dpy = XOpenDisplay (displayname); if (!dpy) { @@ -6079,7 +6097,7 @@ warning: line 3: should text be a metavariable? diff = --- tests/const.c -+++ /tmp/cocci-output-13306-d5d669-const.c ++++ /tmp/cocci-output-6548-85a718-const.c @@ -1,3 +1,3 @@ void foo(const char *text) { - strcat(buf->data, text); @@ -6091,7 +6109,7 @@ warning: line 16: should i be a metavariable? diff = --- tests/const1bis.c -+++ /tmp/cocci-output-13306-3527ca-const1bis.c ++++ /tmp/cocci-output-6548-b181e6-const1bis.c @@ -1,25 +1,25 @@ void foo(int j) { - const int i; @@ -6127,7 +6145,7 @@ const_adding.res diff = --- tests/const_adding.c -+++ /tmp/cocci-output-13306-63e982-const_adding.c ++++ /tmp/cocci-output-6548-156871-const_adding.c @@ -2,6 +2,6 @@ void main(int i) { @@ -6139,7 +6157,7 @@ const_array.res diff = --- tests/const_array.c -+++ /tmp/cocci-output-13306-f1f9f7-const_array.c ++++ /tmp/cocci-output-6548-856ea6-const_array.c @@ -24,9 +24,9 @@ static const struct foo *r128_family4[] }; @@ -6158,7 +6176,7 @@ const_implicit_iso.res diff = --- tests/const_implicit_iso.c -+++ /tmp/cocci-output-13306-865ade-const_implicit_iso.c ++++ /tmp/cocci-output-6548-925216-const_implicit_iso.c @@ -1,4 +1,4 @@ void main(double y) { - const int x; @@ -6168,7 +6186,7 @@ constptr.res diff = --- tests/constptr.c -+++ /tmp/cocci-output-13306-b2edda-constptr.c ++++ /tmp/cocci-output-6548-ff4bad-constptr.c @@ -1,7 +1,7 @@ int main() { @@ -6184,7 +6202,7 @@ constraints.res diff = --- tests/constraints.c -+++ /tmp/cocci-output-13306-f30200-constraints.c ++++ /tmp/cocci-output-6548-a304da-constraints.c @@ -1,23 +1,23 @@ void f() @@ -6219,7 +6237,7 @@ warning: line 9: should f be a metavariable? diff = --- tests/constrem.c -+++ /tmp/cocci-output-13306-40d347-constrem.c ++++ /tmp/cocci-output-6548-141610-constrem.c @@ -1,3 +1 @@ -static const int a; @@ -6227,7 +6245,7 @@ constructor.res diff = --- tests/constructor.c -+++ /tmp/cocci-output-13306-bc6a3b-constructor.c ++++ /tmp/cocci-output-6548-786123-constructor.c @@ -1,5 +1,5 @@ int main () { - imx_add_platform_device_dmamask(Ename, Eid, Eres, Enum_res, @@ -6239,7 +6257,7 @@ constty.res diff = --- tests/constty.c -+++ /tmp/cocci-output-13306-1059fd-constty.c ++++ /tmp/cocci-output-6548-1818c6-constty.c @@ -1,7 +1,6 @@ int main () { const int x; @@ -6251,7 +6269,7 @@ constx.res diff = --- tests/constx.c -+++ /tmp/cocci-output-13306-742727-constx.c ++++ /tmp/cocci-output-6548-31c9a8-constx.c @@ -1,8 +1,8 @@ int main() { - foo(12); @@ -6268,7 +6286,7 @@ } countcalls.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_426cf5.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_426cf5.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_58aed2.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_58aed2.ml File "tests/countcalls.cocci", line 63, characters 30-46: Alert deprecated: Stdlib.String.lowercase Use String.lowercase_ascii/StringLabels.lowercase_ascii instead. @@ -6279,14 +6297,14 @@ cptr.res diff = --- tests/cptr.c -+++ /tmp/cocci-output-13306-061cfe-cptr.c ++++ /tmp/cocci-output-6548-dc77d6-cptr.c @@ -1 +1 @@ -static const char *str = "..."; +static const char *const str = "..."; cr.res diff = --- tests/cr.c -+++ /tmp/cocci-output-13306-da0692-cr.c ++++ /tmp/cocci-output-6548-fa6f50-cr.c @@ -1,7 +1,6 @@ int main(void) { @@ -6299,7 +6317,7 @@ cr1a.res diff = --- tests/cr1a.c -+++ /tmp/cocci-output-13306-b324bd-cr1a.c ++++ /tmp/cocci-output-6548-1264e9-cr1a.c @@ -6,14 +6,17 @@ int __init probe_base_port(int base) if (base) b = e = base; @@ -6324,7 +6342,7 @@ warning: line 5: should handle be a metavariable? diff = --- tests/cs_check.c -+++ /tmp/cocci-output-13306-2ef3c4-cs_check.c ++++ /tmp/cocci-output-6548-40d5b8-cs_check.c @@ -4,7 +4,7 @@ do { last_fn = (fn); if ((last_ret = (re static void nsp_cs_config(dev_link_t *link) { @@ -6337,7 +6355,7 @@ cst.res diff = --- tests/cst.c -+++ /tmp/cocci-output-13306-477108-cst.c ++++ /tmp/cocci-output-6548-fb9380-cst.c @@ -1,5 +1,5 @@ int main(int x) { - emu10k1_t *emu = snd_magic_cast(1, 2, return -ENXIO); @@ -6348,7 +6366,7 @@ cst_null.res diff = --- tests/cst_null.c -+++ /tmp/cocci-output-13306-d6e873-cst_null.c ++++ /tmp/cocci-output-6548-775c81-cst_null.c @@ -2,9 +2,8 @@ void* videobuf_alloc(unsigned int size) { struct videobuf_buffer *vb; @@ -6384,12 +6402,12 @@ vb->magic = MAGIC_BUFFER; cstr.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_88a212.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_88a212.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_70ecd7.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_70ecd7.ml Compilation OK! Loading ML code of the SP... diff = --- tests/cstr.c -+++ /tmp/cocci-output-13306-485b1b-cstr.c ++++ /tmp/cocci-output-6548-9e4d18-cstr.c @@ -1,4 +1,8 @@ int main() { f(1,2,1,2,3); @@ -6403,7 +6421,7 @@ warning: line 4: should foo be a metavariable? diff = --- tests/cststr.c -+++ /tmp/cocci-output-13306-dfd283-cststr.c ++++ /tmp/cocci-output-6548-442de3-cststr.c @@ -1,3 +1,3 @@ int main () { - foo((ptr_t)"blah"); @@ -6413,7 +6431,7 @@ warning: line 4: should x be a metavariable? diff = --- tests/csw.c -+++ /tmp/cocci-output-13306-648064-csw.c ++++ /tmp/cocci-output-6548-409154-csw.c @@ -1,14 +1,6 @@ int main() { switch (x) { @@ -6432,7 +6450,7 @@ dbg.res diff = --- tests/dbg.c -+++ /tmp/cocci-output-13306-195091-dbg.c ++++ /tmp/cocci-output-6548-af5396-dbg.c @@ -4,5 +4,6 @@ static inline void alloc_resource(struct struct resource *pr, *r = &dev->resource[idx]; @@ -6444,7 +6462,7 @@ dbg1.res diff = --- tests/dbg1.c -+++ /tmp/cocci-output-13306-f1db8d-dbg1.c ++++ /tmp/cocci-output-6548-e50abc-dbg1.c @@ -2,4 +2,5 @@ static inline void alloc_resource(struct pci_dev *dev, int idx) { @@ -6454,7 +6472,7 @@ dc_close.res diff = --- tests/dc_close.c -+++ /tmp/cocci-output-13306-615d36-dc_close.c ++++ /tmp/cocci-output-6548-a5bf63-dc_close.c @@ -5,6 +5,7 @@ initicc(struct IsdnCardState *cs) INIT_WORK(&cs->work, icc_bh, cs); @@ -6466,7 +6484,7 @@ debug.res diff = --- tests/debug.c -+++ /tmp/cocci-output-13306-34d2ad-debug.c ++++ /tmp/cocci-output-6548-e9cff8-debug.c @@ -1,5 +1,4 @@ static int __init init_3c574_cs(void) { @@ -6476,7 +6494,7 @@ dec.res diff = --- tests/dec.c -+++ /tmp/cocci-output-13306-11b7e4-dec.c ++++ /tmp/cocci-output-6548-b2c228-dec.c @@ -1,4 +1,5 @@ int f(int x) { + int z; @@ -6486,7 +6504,7 @@ decl.res diff = --- tests/decl.c -+++ /tmp/cocci-output-13306-f816fb-decl.c ++++ /tmp/cocci-output-6548-61e68b-decl.c @@ -1,5 +1,6 @@ static int az_ioctl(int cmd, void *arg) { @@ -6498,7 +6516,7 @@ warning: line 8: should x be a metavariable? diff = --- tests/decl2.c -+++ /tmp/cocci-output-13306-606158-decl2.c ++++ /tmp/cocci-output-6548-8cc156-decl2.c @@ -1,6 +1,6 @@ static int az_ioctl(int cmd, void *arg) { @@ -6510,7 +6528,7 @@ decl_space.res diff = --- tests/decl_space.c -+++ /tmp/cocci-output-13306-443d80-decl_space.c ++++ /tmp/cocci-output-6548-a17269-decl_space.c @@ -1,4 +1,4 @@ int main () { - int *x = y; @@ -6522,7 +6540,7 @@ decl_star.res diff = --- tests/decl_star.c -+++ /tmp/cocci-output-13306-26f12d-decl_star.c ++++ /tmp/cocci-output-6548-eef380-decl_star.c @@ -1,5 +1,5 @@ int main () { - int *x; @@ -6534,7 +6552,7 @@ declmeta.res diff = --- tests/declmeta.c -+++ /tmp/cocci-output-13306-dc9c5c-declmeta.c ++++ /tmp/cocci-output-6548-2ca430-declmeta.c @@ -1,7 +1,7 @@ -int b,c; +int c; @@ -6549,13 +6567,13 @@ defe.res diff = --- tests/defe.c -+++ /tmp/cocci-output-13306-0ab090-defe.c ++++ /tmp/cocci-output-6548-992dda-defe.c @@ -1 +1,0 @@ -#define x 3 define_exp.res diff = --- tests/define_exp.c -+++ /tmp/cocci-output-13306-04c546-define_exp.c ++++ /tmp/cocci-output-6548-16ae4d-define_exp.c @@ -1,5 +1,5 @@ #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? \ - SA_SHIRQ : SA_INTERRUPT) @@ -6566,7 +6584,7 @@ define_param.res diff = --- tests/define_param.c -+++ /tmp/cocci-output-13306-d8a795-define_param.c ++++ /tmp/cocci-output-6548-725b13-define_param.c @@ -1,10 +1,10 @@ -#define fieldsize(a) (sizeof(a)/sizeof(*a)) + @@ -6583,7 +6601,7 @@ defineinit.res diff = --- tests/defineinit.c -+++ /tmp/cocci-output-13306-5bbd7e-defineinit.c ++++ /tmp/cocci-output-6548-080261-defineinit.c @@ -1,3 +1,3 @@ #define MYMACRO(adsf) { \ - .foo = (asdf),\ @@ -6593,7 +6611,7 @@ delete_function.res diff = --- tests/delete_function.c -+++ /tmp/cocci-output-13306-c5b715-delete_function.c ++++ /tmp/cocci-output-6548-ba69d7-delete_function.c @@ -2,12 +2,6 @@ int first () { return 0; } @@ -6610,7 +6628,7 @@ delp.res diff = --- tests/delp.c -+++ /tmp/cocci-output-13306-16a517-delp.c ++++ /tmp/cocci-output-6548-24c5cf-delp.c @@ -1,4 +1,4 @@ int main () { return @@ -6620,7 +6638,7 @@ depfail.res diff = --- tests/depfail.c -+++ /tmp/cocci-output-13306-18212e-depfail.c ++++ /tmp/cocci-output-6548-a31d1b-depfail.c @@ -1,5 +1,4 @@ int main(void) { @@ -6630,7 +6648,7 @@ deref.res diff = --- tests/deref.c -+++ /tmp/cocci-output-13306-a7c03b-deref.c ++++ /tmp/cocci-output-6548-5efe1d-deref.c @@ -1,6 +1,6 @@ int main () { int **q; @@ -6643,7 +6661,7 @@ destroy.res diff = --- tests/destroy.c -+++ /tmp/cocci-output-13306-9b3641-destroy.c ++++ /tmp/cocci-output-6548-156c48-destroy.c @@ -6,7 +6,12 @@ static void wlcore_nvs_cb(const struct f goto out; @@ -6660,7 +6678,7 @@ detect_cast_attr.res diff = --- tests/detect_cast_attr.c -+++ /tmp/cocci-output-13306-7e66e8-detect_cast_attr.c ++++ /tmp/cocci-output-6548-281754-detect_cast_attr.c @@ -2,9 +2,9 @@ int func() @@ -6679,7 +6697,7 @@ warning: line 8: should a be a metavariable? diff = --- tests/detect_macrodecl_attr.c -+++ /tmp/cocci-output-13306-88ec4f-detect_macrodecl_attr.c ++++ /tmp/cocci-output-6548-11746a-detect_macrodecl_attr.c @@ -1,5 +1,5 @@ #define __macro_attr MACROANNOTATION @@ -6690,7 +6708,7 @@ detect_param_attr.res diff = --- tests/detect_param_attr.c -+++ /tmp/cocci-output-13306-89e94d-detect_param_attr.c ++++ /tmp/cocci-output-6548-5d7d8a-detect_param_attr.c @@ -1,11 +1,12 @@ -int func1(int __nocast *u, __nocast int z, int q __nocast, int w) { +int func1(char __nocast *u, __nocast int z, char q __nocast, int w) { @@ -6710,7 +6728,7 @@ detect_struct_endattr.res diff = --- tests/detect_struct_endattr.c -+++ /tmp/cocci-output-13306-7c3c37-detect_struct_endattr.c ++++ /tmp/cocci-output-6548-cc03dc-detect_struct_endattr.c @@ -2,7 +2,6 @@ struct abcd { @@ -6722,7 +6740,7 @@ detect_struct_gccattr.res diff = --- tests/detect_struct_gccattr.c -+++ /tmp/cocci-output-13306-35bde1-detect_struct_gccattr.c ++++ /tmp/cocci-output-6548-75aab2-detect_struct_gccattr.c @@ -1,12 +1,10 @@ struct abcd { int a; @@ -6753,7 +6771,7 @@ devlink.res diff = --- tests/devlink.c -+++ /tmp/cocci-output-13306-0213ff-devlink.c ++++ /tmp/cocci-output-6548-7619ba-devlink.c @@ -1,12 +1,12 @@ -static void cm4000_release(dev_link_t *link); +static void cm4000_release(struct pcmcia_device *link); @@ -6779,7 +6797,7 @@ warning: line 18: should disj_type be a metavariable? diff = --- tests/disj.c -+++ /tmp/cocci-output-13306-8f6e79-disj.c ++++ /tmp/cocci-output-6548-66722f-disj.c @@ -1,31 +1,31 @@ void f() { int disj_id0; @@ -6831,7 +6849,7 @@ disjexpr.res diff = --- tests/disjexpr.c -+++ /tmp/cocci-output-13306-658894-disjexpr.c ++++ /tmp/cocci-output-6548-3e18a7-disjexpr.c @@ -1,3 +1,3 @@ int main (int i) { - f(v.fld, v, v.fld2); @@ -6840,7 +6858,7 @@ disjexpr_ver1.res diff = --- tests/disjexpr_ver1.c -+++ /tmp/cocci-output-13306-767d2f-disjexpr_ver1.c ++++ /tmp/cocci-output-6548-f150a6-disjexpr_ver1.c @@ -1,3 +1,3 @@ int main (int i) { - f(v.fld); @@ -6849,7 +6867,7 @@ disjexpr_ver2.res diff = --- tests/disjexpr_ver2.c -+++ /tmp/cocci-output-13306-40878f-disjexpr_ver2.c ++++ /tmp/cocci-output-6548-8f4aae-disjexpr_ver2.c @@ -1,3 +1,3 @@ int main (int i) { - f(v.fld, v.fld2, v); @@ -6858,7 +6876,7 @@ disjid.res diff = --- tests/disjid.c -+++ /tmp/cocci-output-13306-b17f11-disjid.c ++++ /tmp/cocci-output-6548-266183-disjid.c @@ -1,5 +1,5 @@ -int foo (int x, int z) { return 0; } -int foo (int y, int z) { return 0; } @@ -6872,7 +6890,7 @@ distribute.res diff = --- tests/distribute.c -+++ /tmp/cocci-output-13306-e275e3-distribute.c ++++ /tmp/cocci-output-6548-3c0181-distribute.c @@ -1,4 +1,4 @@ int main(int i) { @@ -6882,7 +6900,7 @@ dotcall.res diff = --- tests/dotcall.c -+++ /tmp/cocci-output-13306-816c25-dotcall.c ++++ /tmp/cocci-output-6548-6b8688-dotcall.c @@ -1,3 +1,2 @@ int main() { - xxx.foobar(); @@ -6890,7 +6908,7 @@ dots_comma.res diff = --- tests/dots_comma.c -+++ /tmp/cocci-output-13306-054c10-dots_comma.c ++++ /tmp/cocci-output-6548-336197-dots_comma.c @@ -1,4 +1,4 @@ int main(void) { @@ -6900,7 +6918,7 @@ double.res diff = --- tests/double.c -+++ /tmp/cocci-output-13306-5b8f33-double.c ++++ /tmp/cocci-output-6548-f695dc-double.c @@ -1,5 +1,5 @@ static void BChannel_proc_xmt(struct BCState *bcs) { - if (!test_bit(BC_FLG_BUSY, &bcs->Flag) && (!skb_queue_len(&bcs->squeue))) { @@ -6911,7 +6929,7 @@ double_assign.res diff = --- tests/double_assign.c -+++ /tmp/cocci-output-13306-205ab9-double_assign.c ++++ /tmp/cocci-output-6548-4f7389-double_assign.c @@ -4,6 +4,5 @@ int main() { } @@ -6922,7 +6940,7 @@ double_lines.res diff = --- tests/double_lines.c -+++ /tmp/cocci-output-13306-9dc032-double_lines.c ++++ /tmp/cocci-output-6548-315cf2-double_lines.c @@ -1,7 +1,4 @@ int main () { test(); @@ -6935,7 +6953,7 @@ doublepos.res diff = --- tests/doublepos.c -+++ /tmp/cocci-output-13306-8185ab-doublepos.c ++++ /tmp/cocci-output-6548-5d4836-doublepos.c @@ -1,5 +1,4 @@ int main() { - f(1,2); @@ -6945,7 +6963,7 @@ doubleswitch.res diff = --- tests/doubleswitch.c -+++ /tmp/cocci-output-13306-0723b4-doubleswitch.c ++++ /tmp/cocci-output-6548-193f89-doubleswitch.c @@ -3,8 +3,6 @@ void zfLnxRecvEth(zdev_t* dev, zbuf_t* b #ifdef ZM_AVOID_UDP_LARGE_PACKET_FAIL zbuf_t *new_buf; @@ -6958,7 +6976,7 @@ doundo.res diff = --- tests/doundo.c -+++ /tmp/cocci-output-13306-966fbe-doundo.c ++++ /tmp/cocci-output-6548-5700fc-doundo.c @@ -4,5 +4,5 @@ int main() { const s8 (*queue_priority_mapping)[2]; @@ -6969,7 +6987,7 @@ dowhile.res diff = --- tests/dowhile.c -+++ /tmp/cocci-output-13306-30a639-dowhile.c ++++ /tmp/cocci-output-6548-ed9496-dowhile.c @@ -1,7 +1,5 @@ int main() { do { @@ -6981,7 +6999,7 @@ dropbr.res diff = --- tests/dropbr.c -+++ /tmp/cocci-output-13306-af1ded-dropbr.c ++++ /tmp/cocci-output-6548-704560-dropbr.c @@ -1,5 +1,4 @@ int main () { - if (a) { @@ -6993,7 +7011,7 @@ dropcom.res diff = --- tests/dropcom.c -+++ /tmp/cocci-output-13306-7de811-dropcom.c ++++ /tmp/cocci-output-6548-ce869b-dropcom.c @@ -2,10 +2,6 @@ int one() { return 0; } #endif /* XXX */ @@ -7008,7 +7026,7 @@ dropenderr.res diff = --- tests/dropenderr.c -+++ /tmp/cocci-output-13306-afd3b7-dropenderr.c ++++ /tmp/cocci-output-6548-2f6edb-dropenderr.c @@ -1,8 +1,6 @@ int main () { - if (x) goto end; @@ -7023,7 +7041,7 @@ dropf.res diff = --- tests/dropf.c -+++ /tmp/cocci-output-13306-d6da69-dropf.c ++++ /tmp/cocci-output-6548-94058e-dropf.c @@ -1,3 +1,3 @@ int main() { - x = f(1) + f(3); @@ -7032,7 +7050,7 @@ dropparam.res diff = --- tests/dropparam.c -+++ /tmp/cocci-output-13306-78c01e-dropparam.c ++++ /tmp/cocci-output-6548-5e7cff-dropparam.c @@ -2,12 +2,12 @@ int f(char *x, int y, char* z) { return; } @@ -7051,7 +7069,7 @@ dtest.res diff = --- tests/dtest.c -+++ /tmp/cocci-output-13306-c53149-dtest.c ++++ /tmp/cocci-output-6548-c348d2-dtest.c @@ -1,5 +1,5 @@ int main() { struct sk_buff *e; @@ -7062,7 +7080,7 @@ eb1.res diff = --- tests/eb1.c -+++ /tmp/cocci-output-13306-e902e4-eb1.c ++++ /tmp/cocci-output-6548-9dddee-eb1.c @@ -1,7 +1,13 @@ int func() { int c; @@ -7081,7 +7099,7 @@ edots.res diff = --- tests/edots.c -+++ /tmp/cocci-output-13306-1b1d11-edots.c ++++ /tmp/cocci-output-6548-88c2a8-edots.c @@ -1,6 +1,6 @@ void main(int i) { - foo[45]; @@ -7094,7 +7112,7 @@ edots_ver1.res diff = --- tests/edots_ver1.c -+++ /tmp/cocci-output-13306-c850fb-edots_ver1.c ++++ /tmp/cocci-output-6548-21995f-edots_ver1.c @@ -1,7 +1,7 @@ void main(int i) { - foo[45]; @@ -7109,7 +7127,7 @@ efi3.res diff = --- tests/efi3.c -+++ /tmp/cocci-output-13306-f86dac-efi3.c ++++ /tmp/cocci-output-6548-0fc184-efi3.c @@ -6,6 +6,6 @@ static efi_status_t virt_efi_get_time(ef goto exit; @@ -7121,7 +7139,7 @@ elsify.res diff = --- tests/elsify.c -+++ /tmp/cocci-output-13306-28428b-elsify.c ++++ /tmp/cocci-output-6548-ed5f39-elsify.c @@ -1,7 +1,7 @@ int main () { if (x) @@ -7135,7 +7153,7 @@ empty.res diff = --- tests/empty.c -+++ /tmp/cocci-output-13306-3a0556-empty.c ++++ /tmp/cocci-output-6548-bd8114-empty.c @@ -1,6 +1,6 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) { @@ -7147,7 +7165,7 @@ end_attr.res diff = --- tests/end_attr.c -+++ /tmp/cocci-output-13306-d6f746-end_attr.c ++++ /tmp/cocci-output-6548-e64bab-end_attr.c @@ -1,10 +1,12 @@ int main() { - struct foo x autofree; @@ -7166,7 +7184,7 @@ end_commas.res diff = --- tests/end_commas.c -+++ /tmp/cocci-output-13306-aabbfb-end_commas.c ++++ /tmp/cocci-output-6548-a758d4-end_commas.c @@ -1,4 +1,6 @@ static struct i2c_client client_template = { - .name = "adv7175_client", @@ -7180,7 +7198,7 @@ warning: line 5: should x be a metavariable? diff = --- tests/endif.c -+++ /tmp/cocci-output-13306-0401b1-endif.c ++++ /tmp/cocci-output-6548-aea45c-endif.c @@ -2,18 +2,23 @@ void f(int i) { x = 1; @@ -7208,7 +7226,7 @@ endnl.res diff = --- tests/endnl.c -+++ /tmp/cocci-output-13306-80e111-endnl.c ++++ /tmp/cocci-output-6548-979493-endnl.c @@ -1,18 +1,36 @@ int main () { +#ifdef FOO @@ -7249,12 +7267,12 @@ endpos.res warning: s: metavariable p not used in the - or context code Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_3df1a1.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_3df1a1.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_73487a.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_73487a.ml Compilation OK! Loading ML code of the SP... diff = --- tests/endpos.c -+++ /tmp/cocci-output-13306-6a4b6f-endpos.c ++++ /tmp/cocci-output-6548-cc8cff-endpos.c @@ -1,4 +1,5 @@ int main () { + main(); @@ -7273,7 +7291,7 @@ enum.res diff = --- tests/enum.c -+++ /tmp/cocci-output-13306-bdbe1b-enum.c ++++ /tmp/cocci-output-6548-047d7d-enum.c @@ -18,5 +18,5 @@ xxx static reg_errcode_t regex_compile () @@ -7284,7 +7302,7 @@ enum_assign.res diff = --- tests/enum_assign.c -+++ /tmp/cocci-output-13306-b6ca7e-enum_assign.c ++++ /tmp/cocci-output-6548-dff672-enum_assign.c @@ -1,6 +1,7 @@ enum h { - a = 0, @@ -7298,20 +7316,20 @@ enumdots.res diff = --- tests/enumdots.c -+++ /tmp/cocci-output-13306-a42ccd-enumdots.c ++++ /tmp/cocci-output-6548-307754-enumdots.c @@ -1,3 +1,2 @@ enum binder_work_type { - BINDER_WORK_TRANSACTION = 12, } t; exitc.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_bd6c0e.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_bd6c0e.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_05c90c.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_05c90c.ml Compilation OK! Loading ML code of the SP... Failure in rule starting on line 8 diff = --- tests/exitc.c -+++ /tmp/cocci-output-13306-18955f-exitc.c ++++ /tmp/cocci-output-6548-846565-exitc.c @@ -1,6 +1,6 @@ int main () { - f(a1); @@ -7328,7 +7346,7 @@ exp.res diff = --- tests/exp.c -+++ /tmp/cocci-output-13306-312bce-exp.c ++++ /tmp/cocci-output-6548-9b298f-exp.c @@ -1,14 +1,14 @@ int main(int i) { @@ -7351,7 +7369,7 @@ expnest.res diff = --- tests/expnest.c -+++ /tmp/cocci-output-13306-71cc41-expnest.c ++++ /tmp/cocci-output-6548-ae83a4-expnest.c @@ -2,5 +2,5 @@ int main() { x = 3 + 4; x = f() + 15; @@ -7362,7 +7380,7 @@ expopt.res diff = --- tests/expopt.c -+++ /tmp/cocci-output-13306-67e616-expopt.c ++++ /tmp/cocci-output-6548-fc17fd-expopt.c @@ -1,5 +1,5 @@ int main() { int *x; @@ -7373,7 +7391,7 @@ expopt2.res diff = --- tests/expopt2.c -+++ /tmp/cocci-output-13306-50e8f8-expopt2.c ++++ /tmp/cocci-output-6548-e63d9b-expopt2.c @@ -1,5 +1,5 @@ void main(int i) { @@ -7384,7 +7402,7 @@ expopt3.res diff = --- tests/expopt3.c -+++ /tmp/cocci-output-13306-ed000b-expopt3.c ++++ /tmp/cocci-output-6548-7f9bf7-expopt3.c @@ -1,5 +1,5 @@ static int pcm20_ioctl(struct video_device *dev, unsigned int cmd, void *arg) { @@ -7396,7 +7414,7 @@ expopt3_ver1.res diff = --- tests/expopt3_ver1.c -+++ /tmp/cocci-output-13306-756266-expopt3_ver1.c ++++ /tmp/cocci-output-6548-41de8b-expopt3_ver1.c @@ -1,6 +1,6 @@ static int pcm20_ioctl(struct video_device *dev, unsigned int cmd, void *arg) { @@ -7409,7 +7427,7 @@ expopt3_ver2.res diff = --- tests/expopt3_ver2.c -+++ /tmp/cocci-output-13306-5a8fa9-expopt3_ver2.c ++++ /tmp/cocci-output-6548-d6c7af-expopt3_ver2.c @@ -1,5 +1,5 @@ static int pcm20_ioctl(struct video_device *dev, unsigned int cmd, void *arg) { @@ -7421,7 +7439,7 @@ exprlist_comma.res diff = --- tests/exprlist_comma.c -+++ /tmp/cocci-output-13306-dadc11-exprlist_comma.c ++++ /tmp/cocci-output-6548-42a9eb-exprlist_comma.c @@ -1,4 +1,4 @@ int main(void) { @@ -7430,8 +7448,8 @@ } extra.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_bfcd2d.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_bfcd2d.ml -File "/tmp/ocaml_cocci_bfcd2d.ml", line 38, characters 4-6: +ocamlopt.opt -shared -o /tmp/ocaml_cocci_4e4508.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_4e4508.ml +File "/tmp/ocaml_cocci_4e4508.ml", line 38, characters 4-6: 38 | let ff = match List.nth __args__ 1 with Coccilib.Str x -> x | _ -> failwith "bad value" in ^^ Warning 26 [unused-var]: unused variable ff. @@ -7439,7 +7457,7 @@ Loading ML code of the SP... diff = --- tests/extra.c -+++ /tmp/cocci-output-13306-54cdd9-extra.c ++++ /tmp/cocci-output-6548-2b9aa1-extra.c @@ -1,12 +1,25 @@ #ifdef FIRST -int main (int a, struct foo *b, struct bar *c) { @@ -7471,7 +7489,7 @@ failing_andany.res diff = --- tests/failing_andany.c -+++ /tmp/cocci-output-13306-e05545-failing_andany.c ++++ /tmp/cocci-output-6548-3b1312-failing_andany.c @@ -1,13 +1,9 @@ static int smc_probe1(struct net_device *dev, void __iomem *ioaddr, unsigned long irq_flags) @@ -7489,7 +7507,7 @@ far.res diff = --- tests/far.c -+++ /tmp/cocci-output-13306-b5d9b0-far.c ++++ /tmp/cocci-output-6548-158a96-far.c @@ -1,7 +1,7 @@ int main(void) { @@ -7504,7 +7522,7 @@ fields.res diff = --- tests/fields.c -+++ /tmp/cocci-output-13306-40d7e4-fields.c ++++ /tmp/cocci-output-6548-71c4a0-fields.c @@ -1,4 +1,7 @@ struct foo x = { + .a = 1, @@ -7517,7 +7535,7 @@ warning: line 4: should x be a metavariable? diff = --- tests/fieldsmin.c -+++ /tmp/cocci-output-13306-6b3111-fieldsmin.c ++++ /tmp/cocci-output-6548-58aaa2-fieldsmin.c @@ -1,5 +1,3 @@ struct foo x = { - .a = 1, @@ -7526,13 +7544,13 @@ }; finalize_only.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_7c0223.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_7c0223.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_975d1e.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_975d1e.ml Compilation OK! Loading ML code of the SP... find_long.res diff = --- tests/find_long.c -+++ /tmp/cocci-output-13306-a25c8f-find_long.c ++++ /tmp/cocci-output-6548-8dcb73-find_long.c @@ -3,8 +3,8 @@ long function() long a; int b; @@ -7547,7 +7565,7 @@ fix_flow_need.res diff = --- tests/fix_flow_need.c -+++ /tmp/cocci-output-13306-013f15-fix_flow_need.c ++++ /tmp/cocci-output-6548-0a0010-fix_flow_need.c @@ -5,7 +5,6 @@ void main(int i) { if(1) { foo(); @@ -7559,7 +7577,7 @@ flex.res diff = --- tests/flex.c -+++ /tmp/cocci-output-13306-f64384-flex.c ++++ /tmp/cocci-output-6548-d9730c-flex.c @@ -3,5 +3,5 @@ struct scmi_msg_resp_sensor_description struct { #define SENSOR_UPDATE_BASE(x) 3 @@ -7570,7 +7588,7 @@ fn_todo.res diff = --- tests/fn_todo.c -+++ /tmp/cocci-output-13306-8bcf8a-fn_todo.c ++++ /tmp/cocci-output-6548-71bd04-fn_todo.c @@ -5,6 +5,6 @@ static void task_kill_later(struct asd_a struct Scsi_Host *shost = sas_ha->core.shost; struct sas_task *task = ascb->uldd_task; @@ -7582,7 +7600,7 @@ fnptr.res diff = --- tests/fnptr.c -+++ /tmp/cocci-output-13306-b70281-fnptr.c ++++ /tmp/cocci-output-6548-0a1111-fnptr.c @@ -8,5 +8,5 @@ static int sci_request_irq(struct sci_po sci_er_interrupt, sci_rx_interrupt, sci_tx_interrupt, sci_br_interrupt, @@ -7594,14 +7612,14 @@ warning: line 6: should x be a metavariable? diff = --- tests/fnret.c -+++ /tmp/cocci-output-13306-bde97b-fnret.c ++++ /tmp/cocci-output-6548-313de0-fnret.c @@ -1 +1 @@ -static void foo(int x) { return; } + fnty.res diff = --- tests/fnty.c -+++ /tmp/cocci-output-13306-4d9fbd-fnty.c ++++ /tmp/cocci-output-6548-56c862-fnty.c @@ -1,4 +1,4 @@ -struct allfns { +struct newname { @@ -7611,14 +7629,14 @@ fntypedef.res diff = --- tests/fntypedef.c -+++ /tmp/cocci-output-13306-476341-fntypedef.c ++++ /tmp/cocci-output-6548-a6c21a-fntypedef.c @@ -1 +1 @@ -typedef void (*toto_t)(int a, int b); +typedef void(*toto_t)(int a, int b, int c); format.res diff = --- tests/format.c -+++ /tmp/cocci-output-13306-6d6325-format.c ++++ /tmp/cocci-output-6548-b0001a-format.c @@ -1,5 +1,5 @@ int main () { - printf("one %d two\n", 1); @@ -7629,14 +7647,14 @@ } format2.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_7c6fe9.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_7c6fe9.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_4c7ac4.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_4c7ac4.ml Compilation OK! Loading ML code of the SP... diff = format string is 1x format string is 2x --- tests/format2.c -+++ /tmp/cocci-output-13306-bc6920-format2.c ++++ /tmp/cocci-output-6548-86f549-format2.c @@ -1,4 +1,3 @@ int main () { foo("blah %x blah"); @@ -7645,7 +7663,7 @@ formatlist.res diff = --- tests/formatlist.c -+++ /tmp/cocci-output-13306-a492c2-formatlist.c ++++ /tmp/cocci-output-6548-258f52-formatlist.c @@ -1,10 +1,10 @@ int main () { foo("xyz %d abc"); @@ -7663,7 +7681,7 @@ fortest.res diff = --- tests/fortest.c -+++ /tmp/cocci-output-13306-54546b-fortest.c ++++ /tmp/cocci-output-6548-86713e-fortest.c @@ -1,18 +1,18 @@ int main() { - for(x=0; x!=10; x++) @@ -7703,7 +7721,7 @@ warning: line 4: should x be a metavariable? diff = --- tests/fortype.c -+++ /tmp/cocci-output-13306-db3714-fortype.c ++++ /tmp/cocci-output-6548-8eeca8-fortype.c @@ -1,4 +1,4 @@ int main () { - for (int x = 0; x!=10; x++) @@ -7714,7 +7732,7 @@ four.res diff = --- tests/four.c -+++ /tmp/cocci-output-13306-74e9bd-four.c ++++ /tmp/cocci-output-6548-5ac1da-four.c @@ -1,5 +1,3 @@ int main () { f(1); @@ -7724,7 +7742,7 @@ foura.res diff = --- tests/foura.c -+++ /tmp/cocci-output-13306-c10c38-foura.c ++++ /tmp/cocci-output-6548-58452e-foura.c @@ -1,5 +1,4 @@ int main () { f(1); @@ -7734,14 +7752,14 @@ fp.res diff = --- tests/fp.c -+++ /tmp/cocci-output-13306-efe49c-fp.c ++++ /tmp/cocci-output-6548-cf84a0-fp.c @@ -1,3 +1,2 @@ int main(int (*x)(int,int)) { - x(); } fresh_id_script.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_573119.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_573119.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_241d87.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_241d87.ml File "tests/fresh_id_script.cocci", line 11, characters 5-14: Warning 26 [unused-var]: unused variable fresh_ml0. File "tests/fresh_id_script.cocci", line 35, characters 5-14: @@ -7756,7 +7774,7 @@ fsh.res diff = --- tests/fsh.c -+++ /tmp/cocci-output-13306-c6cfcd-fsh.c ++++ /tmp/cocci-output-6548-3a7c75-fsh.c @@ -1,4 +1,4 @@ int main () { f(c); @@ -7768,7 +7786,7 @@ warning: line 5: should x be a metavariable? diff = --- tests/fun.c -+++ /tmp/cocci-output-13306-d258f6-fun.c ++++ /tmp/cocci-output-6548-7e5d26-fun.c @@ -1 +1,4 @@ +struct a { + int a; @@ -7777,7 +7795,7 @@ func.res diff = --- tests/func.c -+++ /tmp/cocci-output-13306-913e2b-func.c ++++ /tmp/cocci-output-6548-37e83d-func.c @@ -1,6 +1,7 @@ static int hidg_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) @@ -7791,7 +7809,7 @@ funptr_array.res diff = --- tests/funptr_array.c -+++ /tmp/cocci-output-13306-dfedcc-funptr_array.c ++++ /tmp/cocci-output-6548-30bb4b-funptr_array.c @@ -1 +1 @@ -int (*x[2])(int x); +int (*x[2])(char x); @@ -7811,7 +7829,7 @@ gadget_misc.res diff = --- tests/gadget_misc.c -+++ /tmp/cocci-output-13306-4cf6d1-gadget_misc.c ++++ /tmp/cocci-output-6548-bf2dd4-gadget_misc.c @@ -2,6 +2,5 @@ int main() { if(0) @@ -7822,7 +7840,7 @@ gadget_ninelets_typedef.res diff = --- tests/gadget_ninelets_typedef.c -+++ /tmp/cocci-output-13306-22bcdb-gadget_ninelets_typedef.c ++++ /tmp/cocci-output-6548-ee70cd-gadget_ninelets_typedef.c @@ -1,21 +1,23 @@ typedef double MyFloat; @@ -7856,7 +7874,7 @@ gadget_remove_mpi_function_calls.res diff = --- tests/gadget_remove_mpi_function_calls.c -+++ /tmp/cocci-output-13306-aa8ba9-gadget_remove_mpi_function_calls.c ++++ /tmp/cocci-output-6548-c95b1c-gadget_remove_mpi_function_calls.c @@ -2,6 +2,5 @@ int main(int argc, char **argv) { @@ -7867,7 +7885,7 @@ gadget_remove_used_fields.res diff = --- tests/gadget_remove_used_fields.c -+++ /tmp/cocci-output-13306-04df49-gadget_remove_used_fields.c ++++ /tmp/cocci-output-6548-8226f6-gadget_remove_used_fields.c @@ -1,8 +1,8 @@ -struct particle_data { int i; int j; int k; } * P ; @@ -7889,7 +7907,7 @@ gadget_soa_select.res diff = --- tests/gadget_soa_select.c -+++ /tmp/cocci-output-13306-5492e7-gadget_soa_select.c ++++ /tmp/cocci-output-6548-f1178b-gadget_soa_select.c @@ -1,5 +1,5 @@ struct sph_particle_data_soa_t { - int *Entropy; @@ -7900,7 +7918,7 @@ gadget_sorting_hook.res diff = --- tests/gadget_sorting_hook.c -+++ /tmp/cocci-output-13306-aeed39-gadget_sorting_hook.c ++++ /tmp/cocci-output-6548-bc2d90-gadget_sorting_hook.c @@ -18,10 +18,24 @@ void soa_invalidate_aos__particle_data() int main() @@ -7929,7 +7947,7 @@ gadget_triplets_typedef.res diff = --- tests/gadget_triplets_typedef.c -+++ /tmp/cocci-output-13306-3e975e-gadget_triplets_typedef.c ++++ /tmp/cocci-output-6548-ab0791-gadget_triplets_typedef.c @@ -3,6 +3,8 @@ typedef double MyFloat; typedef long double MyLongDouble; typedef long double MyDoublePos; @@ -7956,7 +7974,7 @@ gadget_triplets_typedef_ipcc.res diff = --- tests/gadget_triplets_typedef_ipcc.c -+++ /tmp/cocci-output-13306-a4d0d7-gadget_triplets_typedef_ipcc.c ++++ /tmp/cocci-output-6548-7ae5f8-gadget_triplets_typedef_ipcc.c @@ -3,6 +3,7 @@ typedef double MyFloat; typedef long double MyLongDouble; typedef long double MyDoublePos; @@ -7977,7 +7995,7 @@ gcc_attr_with_func.res diff = --- tests/gcc_attr_with_func.c -+++ /tmp/cocci-output-13306-a33c9b-gcc_attr_with_func.c ++++ /tmp/cocci-output-6548-34f230-gcc_attr_with_func.c @@ -1,8 +1,8 @@ -int __attribute__((always_inline)) func (int a); +int __attribute__((always_inline)) func (); @@ -8006,7 +8024,7 @@ gcc_attr_with_var.res diff = --- tests/gcc_attr_with_var.c -+++ /tmp/cocci-output-13306-fb2f5e-gcc_attr_with_var.c ++++ /tmp/cocci-output-6548-987be5-gcc_attr_with_var.c @@ -1,39 +1,43 @@ -int var1_end __attribute__((myattr1_end)); +int var1_end __attribute__((section(".shared"))); @@ -8074,7 +8092,7 @@ gcc_min_max.res diff = --- tests/gcc_min_max.c -+++ /tmp/cocci-output-13306-fccc9d-gcc_min_max.c ++++ /tmp/cocci-output-6548-8f6bec-gcc_min_max.c @@ -1,8 +1,8 @@ int main() { @@ -8091,7 +8109,7 @@ getc.res diff = --- tests/getc.c -+++ /tmp/cocci-output-13306-d96c97-getc.c ++++ /tmp/cocci-output-6548-c43a4a-getc.c @@ -1,4 +1,4 @@ int IFoo_QueryInterface(int *iface, long *riid, void **ppv) { @@ -8101,7 +8119,7 @@ gilles-question.res diff = --- tests/gilles-question.c -+++ /tmp/cocci-output-13306-e13bff-gilles-question.c ++++ /tmp/cocci-output-6548-f86822-gilles-question.c @@ -2,8 +2,6 @@ void main(int i) { f(0); @@ -8114,7 +8132,7 @@ gotobreak.res diff = --- tests/gotobreak.c -+++ /tmp/cocci-output-13306-0d1b26-gotobreak.c ++++ /tmp/cocci-output-6548-0741a9-gotobreak.c @@ -11,5 +11,5 @@ static void sedlbauer_config(struct pcmc CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple)); } @@ -8127,7 +8145,7 @@ warning: line 4: should y be a metavariable? diff = --- tests/hd.c -+++ /tmp/cocci-output-13306-ec7f8a-hd.c ++++ /tmp/cocci-output-6548-01f4c6-hd.c @@ -1,3 +1,3 @@ #include "hd.h" @@ -8136,7 +8154,7 @@ headers.res diff = --- tests/headers.c -+++ /tmp/cocci-output-13306-f56bb6-headers.c ++++ /tmp/cocci-output-6548-d11afd-headers.c @@ -10,12 +10,12 @@ static int empeg_write (struct usb_seria } @@ -8155,7 +8173,7 @@ hex.res diff = --- tests/hex.c -+++ /tmp/cocci-output-13306-caa3a0-hex.c ++++ /tmp/cocci-output-6548-c69ff7-hex.c @@ -1,3 +1,2 @@ int main() { - f(0x00); @@ -8163,7 +8181,7 @@ hil1.res diff = --- tests/hil1.c -+++ /tmp/cocci-output-13306-573d58-hil1.c ++++ /tmp/cocci-output-6548-c0a7a8-hil1.c @@ -2,5 +2,5 @@ { HILSE_FUNC, { func: &funct }, funct_arg, zero_rc }, @@ -8175,12 +8193,12 @@ exn while in timeout_function idcon_ocaml.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_8a8a63.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_8a8a63.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_18f3db.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_18f3db.ml Compilation OK! Loading ML code of the SP... diff = --- tests/idcon_ocaml.c -+++ /tmp/cocci-output-13306-2b8b6b-idcon_ocaml.c ++++ /tmp/cocci-output-6548-d12e1a-idcon_ocaml.c @@ -1,5 +1,5 @@ void f(void) { - g(a); @@ -8194,7 +8212,7 @@ idstr.res diff = --- tests/idstr.c -+++ /tmp/cocci-output-13306-543664-idstr.c ++++ /tmp/cocci-output-6548-f46438-idstr.c @@ -1,3 +1,3 @@ int main () { - printf("arena 0x%08x, numfree = %d\n", (unsigned)dt, dt->numfree); @@ -8203,7 +8221,7 @@ if.res diff = --- tests/if.c -+++ /tmp/cocci-output-13306-87a52b-if.c ++++ /tmp/cocci-output-6548-9d8877-if.c @@ -1,27 +1,37 @@ int main () { + before(); @@ -8245,7 +8263,7 @@ ifadd.res diff = --- tests/ifadd.c -+++ /tmp/cocci-output-13306-4e2aba-ifadd.c ++++ /tmp/cocci-output-6548-6ad6e6-ifadd.c @@ -3,6 +3,7 @@ int main() { if (x) { one(); @@ -8260,7 +8278,7 @@ ifd.res diff = --- tests/ifd.c -+++ /tmp/cocci-output-13306-bd241f-ifd.c ++++ /tmp/cocci-output-6548-259240-ifd.c @@ -1,9 +1,13 @@ int main () { one(); @@ -8278,7 +8296,7 @@ ifdef1.res diff = --- tests/ifdef1.c -+++ /tmp/cocci-output-13306-4d63d2-ifdef1.c ++++ /tmp/cocci-output-6548-d6250b-ifdef1.c @@ -1,5 +1,8 @@ #include #include @@ -8291,7 +8309,7 @@ ifdef2.res diff = --- tests/ifdef2.c -+++ /tmp/cocci-output-13306-35f2e0-ifdef2.c ++++ /tmp/cocci-output-6548-be9f2c-ifdef2.c @@ -1,6 +1,11 @@ #include #include @@ -8307,7 +8325,7 @@ ifdef3.res diff = --- tests/ifdef3.c -+++ /tmp/cocci-output-13306-f1effa-ifdef3.c ++++ /tmp/cocci-output-6548-66cca6-ifdef3.c @@ -2,6 +2,15 @@ #include #include @@ -8329,7 +8347,7 @@ warning: line 9: should irq_desc be a metavariable? diff = --- tests/ifdef4.c -+++ /tmp/cocci-output-13306-0166b3-ifdef4.c ++++ /tmp/cocci-output-6548-9fced1-ifdef4.c @@ -7,7 +7,10 @@ void init_IRQ(void) { @@ -8345,7 +8363,7 @@ ifdef5.res diff = --- tests/ifdef5.c -+++ /tmp/cocci-output-13306-1b6caf-ifdef5.c ++++ /tmp/cocci-output-6548-c8eaeb-ifdef5.c @@ -11,3 +11,11 @@ void init_IRQ(void) uselessCall(); } @@ -8361,7 +8379,7 @@ ifdef6.res diff = --- tests/ifdef6.c -+++ /tmp/cocci-output-13306-6f34d0-ifdef6.c ++++ /tmp/cocci-output-6548-ae03d3-ifdef6.c @@ -1,5 +1,8 @@ #include #include @@ -8374,7 +8392,7 @@ ifdef6a.res diff = --- tests/ifdef6a.c -+++ /tmp/cocci-output-13306-e042aa-ifdef6a.c ++++ /tmp/cocci-output-6548-0ffca3-ifdef6a.c @@ -1,4 +1,7 @@ #include +#ifdef CONFIG_NKERNEL @@ -8386,7 +8404,7 @@ ifdefmeta.res diff = --- tests/ifdefmeta.c -+++ /tmp/cocci-output-13306-90a8c1-ifdefmeta.c ++++ /tmp/cocci-output-6548-f93eff-ifdefmeta.c @@ -1,26 +1,30 @@ int main() { - buf = alloca(3 @@ -8455,7 +8473,7 @@ ifdefmeta1.res diff = --- tests/ifdefmeta1.c -+++ /tmp/cocci-output-13306-a41d90-ifdefmeta1.c ++++ /tmp/cocci-output-6548-ffefbd-ifdefmeta1.c @@ -1,17 +1,2 @@ int main() { - buf = alloca(3 @@ -8477,7 +8495,7 @@ ifdefmeta2.res diff = --- tests/ifdefmeta2.c -+++ /tmp/cocci-output-13306-6526b1-ifdefmeta2.c ++++ /tmp/cocci-output-6548-1dc8e4-ifdefmeta2.c @@ -1,12 +1,2 @@ int main() { - buf = alloca(3 @@ -8494,7 +8512,7 @@ ifdefmeta3.res diff = --- tests/ifdefmeta3.c -+++ /tmp/cocci-output-13306-933dda-ifdefmeta3.c ++++ /tmp/cocci-output-6548-bae5ad-ifdefmeta3.c @@ -1,11 +1,5 @@ int main () { f(); @@ -8511,7 +8529,7 @@ ifend.res diff = --- tests/ifend.c -+++ /tmp/cocci-output-13306-85f01f-ifend.c ++++ /tmp/cocci-output-6548-88e905-ifend.c @@ -3,5 +3,3 @@ static int vortex_debug = VORTEX_DEBUG; #else static int vortex_debug = 1; @@ -8521,7 +8539,7 @@ ifgoto.res diff = --- tests/ifgoto.c -+++ /tmp/cocci-output-13306-6111af-ifgoto.c ++++ /tmp/cocci-output-6548-61c2d1-ifgoto.c @@ -1,5 +1,7 @@ int main () { - if (x) @@ -8535,7 +8553,7 @@ ifields.res diff = --- tests/ifields.c -+++ /tmp/cocci-output-13306-f536ea-ifields.c ++++ /tmp/cocci-output-6548-9d0d9f-ifields.c @@ -1,14 +1,16 @@ typedef struct tag_obj { int x; @@ -8558,7 +8576,7 @@ ifif.res diff = --- tests/ifif.c -+++ /tmp/cocci-output-13306-5dfebd-ifif.c ++++ /tmp/cocci-output-6548-79dbc2-ifif.c @@ -1,5 +1,13 @@ int main () { +#ifdef FOO1 @@ -8576,7 +8594,7 @@ ifreturn.res diff = --- tests/ifreturn.c -+++ /tmp/cocci-output-13306-c73425-ifreturn.c ++++ /tmp/cocci-output-6548-187724-ifreturn.c @@ -1,31 +1,46 @@ int main () { if (x) { @@ -8638,7 +8656,7 @@ ifreturn3.res diff = --- tests/ifreturn3.c -+++ /tmp/cocci-output-13306-e2e441-ifreturn3.c ++++ /tmp/cocci-output-6548-d5babf-ifreturn3.c @@ -3,7 +3,10 @@ int GetExitCode (int iFlag_Code) if(iFlag_Code==OK) { return OK; @@ -8664,7 +8682,7 @@ ifreturn4.res diff = --- tests/ifreturn4.c -+++ /tmp/cocci-output-13306-a5f712-ifreturn4.c ++++ /tmp/cocci-output-6548-e1deba-ifreturn4.c @@ -2,10 +2,16 @@ int GetExitCode (int iFlag_Code) { if(iFlag_Code==OK) { @@ -8688,7 +8706,7 @@ ifreturn6.res diff = --- tests/ifreturn6.c -+++ /tmp/cocci-output-13306-9ac032-ifreturn6.c ++++ /tmp/cocci-output-6548-7f31de-ifreturn6.c @@ -3,7 +3,8 @@ int main () { blah(); goto end; @@ -8702,7 +8720,7 @@ ifzer.res diff = --- tests/ifzer.c -+++ /tmp/cocci-output-13306-347912-ifzer.c ++++ /tmp/cocci-output-6548-0460ce-ifzer.c @@ -3,6 +3,5 @@ int main() { and have lived on another thread's stack; that stack may have become unmapped meanwhile (CONFIG_DEBUG_PAGEALLOC). */ @@ -8713,7 +8731,7 @@ ifzz.res diff = --- tests/ifzz.c -+++ /tmp/cocci-output-13306-7a4bda-ifzz.c ++++ /tmp/cocci-output-6548-d5fcfb-ifzz.c @@ -2,9 +2,9 @@ if 0 char c; #endif @@ -8729,7 +8747,7 @@ inc.res diff = --- tests/inc.c -+++ /tmp/cocci-output-13306-2ae2d2-inc.c ++++ /tmp/cocci-output-6548-0feff7-inc.c @@ -1,2 +1 @@ -#define foo 3 -#define xxx 4 @@ -8738,7 +8756,7 @@ incl.res diff = --- tests/incl.c -+++ /tmp/cocci-output-13306-7de4cc-incl.c ++++ /tmp/cocci-output-6548-fd4e6f-incl.c @@ -1,6 +1,8 @@ +#include "before.h" #include @@ -8751,7 +8769,7 @@ incl2.res diff = --- tests/incl2.c -+++ /tmp/cocci-output-13306-3ad8fc-incl2.c ++++ /tmp/cocci-output-6548-8d84cd-incl2.c @@ -1,3 +1,4 @@ +#include "beginning.h" #include @@ -8760,7 +8778,7 @@ inclifdef.res diff = --- tests/inclifdef.c -+++ /tmp/cocci-output-13306-df992a-inclifdef.c ++++ /tmp/cocci-output-6548-83b06e-inclifdef.c @@ -1,4 +1,5 @@ #include +#include @@ -8770,7 +8788,7 @@ include.res diff = --- tests/include.c -+++ /tmp/cocci-output-13306-012f1b-include.c ++++ /tmp/cocci-output-6548-aa9b33-include.c @@ -1,8 +1,6 @@ #include @@ -8783,7 +8801,7 @@ incompatible_value.res diff = --- tests/incompatible_value.c -+++ /tmp/cocci-output-13306-4d6b20-incompatible_value.c ++++ /tmp/cocci-output-6548-099df8-incompatible_value.c @@ -4,6 +4,6 @@ int main() { } @@ -8800,7 +8818,7 @@ inherited.res diff = --- tests/inherited.c -+++ /tmp/cocci-output-13306-ac2592-inherited.c ++++ /tmp/cocci-output-6548-325675-inherited.c @@ -6,5 +6,5 @@ void main(int i) { h(2); h2(2); @@ -8811,7 +8829,7 @@ inherited_ver1.res diff = --- tests/inherited_ver1.c -+++ /tmp/cocci-output-13306-216505-inherited_ver1.c ++++ /tmp/cocci-output-6548-66c15e-inherited_ver1.c @@ -3,8 +3,8 @@ void main(int i) { //g(1); f(2); @@ -8827,7 +8845,7 @@ inhmet.res diff = --- tests/inhmet.c -+++ /tmp/cocci-output-13306-d4ed78-inhmet.c ++++ /tmp/cocci-output-6548-556401-inhmet.c @@ -1,3 +1,3 @@ int main () { - x->s = 12; @@ -8836,7 +8854,7 @@ inhpos.res diff = --- tests/inhpos.c -+++ /tmp/cocci-output-13306-369fe6-inhpos.c ++++ /tmp/cocci-output-6548-db1db8-inhpos.c @@ -1,3 +1,2 @@ int main () { - g(3); @@ -8845,7 +8863,7 @@ warning: line 5: should var be a metavariable? diff = --- tests/initializer.c -+++ /tmp/cocci-output-13306-3eddca-initializer.c ++++ /tmp/cocci-output-6548-7f2191-initializer.c @@ -1,5 +1,6 @@ struct SHT var = { .f1 = toto1, @@ -8859,21 +8877,21 @@ inline.res diff = --- tests/inline.c -+++ /tmp/cocci-output-13306-999fcf-inline.c ++++ /tmp/cocci-output-6548-2229c3-inline.c @@ -1 +1 @@ -inline void foo(int x) { return; } + insdef.res diff = --- tests/insdef.c -+++ /tmp/cocci-output-13306-0d899b-insdef.c ++++ /tmp/cocci-output-6548-90e29e-insdef.c @@ -1 +1,2 @@ #define TABINFOGEN +#include int2bool-local.res diff = --- tests/int2bool-local.c -+++ /tmp/cocci-output-13306-6c642d-int2bool-local.c ++++ /tmp/cocci-output-6548-42ddde-int2bool-local.c @@ -1,8 +1,9 @@ int nxnypz1(){ - int x, y, z; @@ -8919,7 +8937,7 @@ introbrace.res diff = --- tests/introbrace.c -+++ /tmp/cocci-output-13306-ad4b76-introbrace.c ++++ /tmp/cocci-output-6548-608d80-introbrace.c @@ -1,8 +1,12 @@ int main() { - if (x) @@ -8938,7 +8956,7 @@ invert.res diff = --- tests/invert.c -+++ /tmp/cocci-output-13306-05184b-invert.c ++++ /tmp/cocci-output-6548-ba58b3-invert.c @@ -1,3 +1,3 @@ int main () { - x = y + z; @@ -8947,7 +8965,7 @@ ip.res diff = --- tests/ip.c -+++ /tmp/cocci-output-13306-197ca7-ip.c ++++ /tmp/cocci-output-6548-5bca66-ip.c @@ -2,10 +2,18 @@ void GetInfoDestTV(short sNoFo) { if(sNoFo == 1) @@ -8976,7 +8994,7 @@ ip2.res diff = --- tests/ip2.c -+++ /tmp/cocci-output-13306-8fea6d-ip2.c ++++ /tmp/cocci-output-6548-62a460-ip2.c @@ -1,11 +1,17 @@ void GetInfoDestTV(short sNoFo) { @@ -9001,7 +9019,7 @@ isococci.res diff = --- tests/isococci.c -+++ /tmp/cocci-output-13306-ec1435-isococci.c ++++ /tmp/cocci-output-6548-a9a8ea-isococci.c @@ -1,6 +1,4 @@ void f(int i) { @@ -9014,7 +9032,7 @@ warning: r: metavariable E not used in the - or context code diff = --- tests/isoif.c -+++ /tmp/cocci-output-13306-4249cc-isoif.c ++++ /tmp/cocci-output-6548-ef6534-isoif.c @@ -1,4 +1,2 @@ int main () { - if (x == NULL) one(); else two(); @@ -9023,7 +9041,7 @@ isotest.res diff = --- tests/isotest.c -+++ /tmp/cocci-output-13306-cc29a7-isotest.c ++++ /tmp/cocci-output-6548-bfe5a1-isotest.c @@ -1,7 +1,6 @@ void main(int i) { @@ -9036,7 +9054,7 @@ isotest2.res diff = --- tests/isotest2.c -+++ /tmp/cocci-output-13306-d12928-isotest2.c ++++ /tmp/cocci-output-6548-45acc3-isotest2.c @@ -1,7 +1,6 @@ void main(int i) { @@ -9047,7 +9065,7 @@ iteration.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_628b4a.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_628b4a.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_b7c76c.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_b7c76c.ml Compilation OK! Loading ML code of the SP... 1 pending new file instances @@ -9056,7 +9074,7 @@ exn while in timeout_function iteration_after_merge.res Using native version of ocamlc/ocamlopt/ocamldep -ocamlopt.opt -shared -o /tmp/ocaml_cocci_5c67f7.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_5c67f7.ml +ocamlopt.opt -shared -o /tmp/ocaml_cocci_e96d4b.cmxs -g -I /build/coccinelle-1.1.1.deb/ocaml -I /usr/lib/ocaml /tmp/ocaml_cocci_e96d4b.ml Compilation OK! Loading ML code of the SP... exn while in timeout_function @@ -11571,48 +11589,48 @@ dh_shlibdeps -a dh_installdeb dh_ocaml -W: coccinelle doesn't resolve dependency on unit Data -W: coccinelle doesn't resolve dependency on unit Cpp_token_c -W: coccinelle doesn't resolve dependency on unit Control_flow_c -W: coccinelle doesn't resolve dependency on unit Danger -W: coccinelle doesn't resolve dependency on unit Ograph_extended -W: coccinelle doesn't resolve dependency on unit Type_annoter_c -W: coccinelle doesn't resolve dependency on unit Control_flow_c +W: coccinelle doesn't resolve dependency on unit Lexer_parser +W: coccinelle doesn't resolve dependency on unit Parsing_stat +W: coccinelle doesn't resolve dependency on unit Lexer_parser +W: coccinelle doesn't resolve dependency on unit Parsing_consistency_c W: coccinelle doesn't resolve dependency on unit Danger -W: coccinelle doesn't resolve dependency on unit Token_views_c -W: coccinelle doesn't resolve dependency on unit Flag_parsing_cocci W: coccinelle doesn't resolve dependency on unit Parsing_stat -W: coccinelle doesn't resolve dependency on unit Token_helpers -W: coccinelle doesn't resolve dependency on unit Semantic_c -W: coccinelle doesn't resolve dependency on unit Type_annoter_c +W: coccinelle doesn't resolve dependency on unit Parsing_recovery_c +W: coccinelle doesn't resolve dependency on unit Includes W: coccinelle doesn't resolve dependency on unit Data +W: coccinelle doesn't resolve dependency on unit Token_views_c +W: coccinelle doesn't resolve dependency on unit Semantic_c +W: coccinelle doesn't resolve dependency on unit Parsing_consistency_c +W: coccinelle doesn't resolve dependency on unit Token_annot +W: coccinelle doesn't resolve dependency on unit Control_flow_c +W: coccinelle doesn't resolve dependency on unit Flag_parsing_cocci +W: coccinelle doesn't resolve dependency on unit Includes_cache W: coccinelle doesn't resolve dependency on unit Parsing_hacks +W: coccinelle doesn't resolve dependency on unit Cpp_token_c +W: coccinelle doesn't resolve dependency on unit Flag_parsing_cocci +W: coccinelle doesn't resolve dependency on unit Type_annoter_c +W: coccinelle doesn't resolve dependency on unit Type_annoter_c +W: coccinelle doesn't resolve dependency on unit Ograph_extended W: coccinelle doesn't resolve dependency on unit Parsing_hacks +W: coccinelle doesn't resolve dependency on unit Danger W: coccinelle doesn't resolve dependency on unit Includes -W: coccinelle doesn't resolve dependency on unit Semantic_c -W: coccinelle doesn't resolve dependency on unit Flag_parsing_cocci -W: coccinelle doesn't resolve dependency on unit Parsing_recovery_c -W: coccinelle doesn't resolve dependency on unit Lexer_parser +W: coccinelle doesn't resolve dependency on unit Data W: coccinelle doesn't resolve dependency on unit Cpp_token_c -W: coccinelle doesn't resolve dependency on unit Parsing_consistency_c -W: coccinelle doesn't resolve dependency on unit Includes_cache -W: coccinelle doesn't resolve dependency on unit Token_helpers -W: coccinelle doesn't resolve dependency on unit Regexp_pcre +W: coccinelle doesn't resolve dependency on unit Semantic_c W: coccinelle doesn't resolve dependency on unit Token_annot +W: coccinelle doesn't resolve dependency on unit Token_helpers W: coccinelle doesn't resolve dependency on unit Includes_cache -W: coccinelle doesn't resolve dependency on unit Parsing_consistency_c -W: coccinelle doesn't resolve dependency on unit Includes -W: coccinelle doesn't resolve dependency on unit Parsing_stat -W: coccinelle doesn't resolve dependency on unit Parsing_recovery_c +W: coccinelle doesn't resolve dependency on unit Control_flow_c W: coccinelle doesn't resolve dependency on unit Regexp_pcre -W: coccinelle doesn't resolve dependency on unit Lexer_parser -W: coccinelle doesn't resolve dependency on unit Token_annot +W: coccinelle doesn't resolve dependency on unit Regexp_pcre +W: coccinelle doesn't resolve dependency on unit Token_helpers +W: coccinelle doesn't resolve dependency on unit Parsing_recovery_c dh_gencontrol dh_md5sums dh_builddeb -dpkg-deb: building package 'coccinelle-dbgsym' in '../coccinelle-dbgsym_1.1.1.deb-2_arm64.deb'. -dpkg-deb: building package 'coccinelle-doc' in '../coccinelle-doc_1.1.1.deb-2_all.deb'. dpkg-deb: building package 'coccinelle' in '../coccinelle_1.1.1.deb-2_arm64.deb'. +dpkg-deb: building package 'coccinelle-doc' in '../coccinelle-doc_1.1.1.deb-2_all.deb'. +dpkg-deb: building package 'coccinelle-dbgsym' in '../coccinelle-dbgsym_1.1.1.deb-2_arm64.deb'. dpkg-genbuildinfo --build=binary -O../coccinelle_1.1.1.deb-2_arm64.buildinfo dpkg-genchanges --build=binary -O../coccinelle_1.1.1.deb-2_arm64.changes dpkg-genchanges: info: binary-only upload (no source code included) @@ -11620,12 +11638,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/9322/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/17026 and its subdirectories -I: Current time: Tue Apr 11 06:20:43 -12 2023 -I: pbuilder-time-stamp: 1681237243 +I: removing directory /srv/workspace/pbuilder/9322 and its subdirectories +I: Current time: Tue May 14 14:57:52 +14 2024 +I: pbuilder-time-stamp: 1715648272