Merge lp://staging/~pedronis/u1db/fix-sizeof-is-not-len into lp://staging/u1db

Proposed by Samuele Pedroni
Status: Merged
Approved by: dobey
Approved revision: 438
Merged at revision: 438
Proposed branch: lp://staging/~pedronis/u1db/fix-sizeof-is-not-len
Merge into: lp://staging/u1db
Diff against target: 41 lines (+5/-4)
1 file modified
src/u1db_query.c (+5/-4)
To merge this branch: bzr merge lp://staging/~pedronis/u1db/fix-sizeof-is-not-len
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+165351@code.staging.launchpad.net

Commit message

fix code that was using sizeof of value_types like it was some sort of dynamic array len, use the explicit arity value instead

Description of the change

fix code that was using sizeof of value_types like it was some sort of dynamic array len, use the explicit arity value instead

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~pedronis/u1db/fix-sizeof-is-not-len into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~pedronis/u1db/fix-sizeof-is-not-len into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so
-- checking for module 'oauth'
-- found oauth, version 0.9.4
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so
-- checking for module 'json'
-- found json, version 0.9
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so
-- checking for module 'sqlite3'
-- found sqlite3, version 3.7.9
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target ReplicatePythonSourceTree
[100%] Built target ReplicatePythonSourceTree
Scanning dependencies of target build-debug-for-tests

/bin/sh: 1: python-dbg: not found
make[3]: *** [CMakeFiles/build-debug-for-tests] Error 127
make[2]: *** [CMakeFiles/build-debug-for-tests.dir/all] Error 2
make[1]: *** [CMakeFiles/check-valgrind.dir/rule] Error 2
make: *** [check-valgrind] Error 2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches