diff options
| -rw-r--r-- | COPYING | 6 | ||||
| m--------- | examples/blog/web-common | 0 | ||||
| m--------- | examples/shop/web-common | 0 | ||||
| -rw-r--r-- | src/tests/test.debug | 37 |
4 files changed, 4 insertions, 39 deletions
@@ -11,8 +11,10 @@ The merchant's frontend logic (i.e. JavaScript interacting with the wallet, sample code for a shop) is under the GNU LGPL (but we may choose to change this to be in the public domain or BSD-licensed if necessary; the code is so short that there is -anyway the question whether it is copyrightable). The license -text for this code is in COPYING.LGPL. +anyway the question whether it is copyrightable). Under this same +license, it comes the merchant library (src/lib/) as it can be linked +with more diverse licensed software. The license text for this code +is in COPYING.LGPL. In examples/blog/articles/ we included a book by Richard Stallman. diff --git a/examples/blog/web-common b/examples/blog/web-common -Subproject c2aeff13200a470f5b072f23e495185a20d2349 +Subproject 9867242e4b867234fff4511d4b4f457acd4e5da diff --git a/examples/shop/web-common b/examples/shop/web-common -Subproject 98130c928db4fcc8f06abfa618d649fc979eff1 +Subproject 9867242e4b867234fff4511d4b4f457acd4e5da diff --git a/src/tests/test.debug b/src/tests/test.debug deleted file mode 100644 index 1817f7f0..00000000 --- a/src/tests/test.debug +++ /dev/null @@ -1,37 +0,0 @@ -==5558== Memcheck, a memory error detector -==5558== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. -==5558== Using Valgrind-3.10.0 and LibVEX; rerun with -h for copyright info -==5558== Command: ./merchant-contract-test -c merchant.conf -==5558== Parent PID: 483 -==5558== -==5558== -==5558== Process terminating with default action of signal 11 (SIGSEGV) -==5558== Bad permissions for mapped region at address 0x804AB80 -==5558== at 0x4108DAA: ??? (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x4108E7A: ??? (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x410DAFB: json_delete (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x410C28F: ??? (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x410C42B: json_vpack_ex (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x410C530: json_pack (in /usr/lib/i386-linux-gnu/libjansson.so.4.7.0) -==5558== by 0x80494CE: run (merchant-contract-test.c:148) -==5558== by 0x41543EE: program_main (program.c:84) -==5558== by 0x41592ED: run_ready (scheduler.c:587) -==5558== by 0x41592ED: GNUNET_SCHEDULER_run (scheduler.c:868) -==5558== by 0x4154B09: GNUNET_PROGRAM_run2 (program.c:302) -==5558== by 0x4154E01: GNUNET_PROGRAM_run (program.c:341) -==5558== by 0x8049210: main (merchant-contract-test.c:195) -==5558== -==5558== HEAP SUMMARY: -==5558== in use at exit: 133,271 bytes in 2,334 blocks -==5558== total heap usage: 5,082 allocs, 2,748 frees, 277,172 bytes allocated -==5558== -==5558== LEAK SUMMARY: -==5558== definitely lost: 149 bytes in 4 blocks -==5558== indirectly lost: 293 bytes in 10 blocks -==5558== possibly lost: 359 bytes in 18 blocks -==5558== still reachable: 132,470 bytes in 2,302 blocks -==5558== suppressed: 0 bytes in 0 blocks -==5558== Rerun with --leak-check=full to see details of leaked memory -==5558== -==5558== For counts of detected and suppressed errors, rerun with: -v -==5558== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) |