libmemcached

Merge lp://qastaging/~stewart/libmemcached/build-fixes into lp://qastaging/~tangent-org/libmemcached/trunk

  1. build-fixes
  2. Merge into trunk
Proposed by Stewart Smith
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~stewart/libmemcached/build-fixes
Merge into: lp://qastaging/~tangent-org/libmemcached/trunk
Prerequisite: lp://qastaging/~mordred/libmemcached/pandora-build
Diff against target: 77 lines (+6/-7)
4 files modified
example/memcached_light.c (+0/-1)
libmemcached/hosts.c (+1/-1)
libmemcached/parse.c (+2/-2)
tests/function.c (+3/-3)
To merge this branch: bzr merge lp://qastaging/~stewart/libmemcached/build-fixes
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+17113@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) wrote :

So it builds on my laptop.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'example/memcached_light.c'
2--- example/memcached_light.c 2009-10-16 15:01:26 +0000
3+++ example/memcached_light.c 2010-01-10 23:43:12 +0000
4@@ -311,7 +311,6 @@
5 fds[max_poll].events= POLLIN;
6 fds[max_poll].revents= 0;
7 fds[max_poll].fd= server_sockets[max_poll];
8- ++max_poll;
9 }
10
11 while (true)
12
13=== modified file 'libmemcached/hosts.c'
14--- libmemcached/hosts.c 2010-01-10 23:43:12 +0000
15+++ libmemcached/hosts.c 2010-01-10 23:43:12 +0000
16@@ -295,7 +295,7 @@
17 memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list)
18 {
19 unsigned int x;
20- uint16_t count;
21+ uint32_t count;
22 memcached_server_st *new_host_list;
23
24 if (!list)
25
26=== modified file 'libmemcached/parse.c'
27--- libmemcached/parse.c 2009-12-16 23:01:10 +0000
28+++ libmemcached/parse.c 2010-01-10 23:43:12 +0000
29@@ -10,7 +10,7 @@
30 memcached_server_st *memcached_servers_parse(const char *server_strings)
31 {
32 char *string;
33- uint32_t port;
34+ in_port_t port;
35 uint32_t weight;
36 const char *begin_ptr;
37 const char *end_ptr;
38@@ -52,7 +52,7 @@
39
40 ptr++;
41
42- port= (uint32_t) strtoul(ptr, (char **)NULL, 10);
43+ port= (in_port_t) strtoul(ptr, (char **)NULL, 10);
44
45 ptr2= index(ptr, ' ');
46 if (! ptr2)
47
48=== modified file 'tests/function.c'
49--- tests/function.c 2010-01-10 23:43:12 +0000
50+++ tests/function.c 2010-01-10 23:43:12 +0000
51@@ -80,7 +80,7 @@
52 }
53
54 #define TEST_PORT_COUNT 7
55-uint32_t test_ports[TEST_PORT_COUNT];
56+in_port_t test_ports[TEST_PORT_COUNT];
57
58 static memcached_return_t server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
59 {
60@@ -106,7 +106,7 @@
61
62 for (x= 0; x < TEST_PORT_COUNT; x++)
63 {
64- test_ports[x]= (uint32_t)random() % 64000;
65+ test_ports[x]= (in_port_t)random() % 64000;
66 rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
67 test_truth(memcached_server_count(local_memc) == x + 1);
68 test_truth(memcached_servers_count(local_memc->hosts) == x+1);
69@@ -177,7 +177,7 @@
70
71 for (x= 0; x < TEST_PORT_COUNT; x++)
72 {
73- test_ports[x]= (uint32_t)(random() % 64000);
74+ test_ports[x]= (in_port_t)(random() % 64000);
75 rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
76 test_truth(memcached_server_count(local_memc) == x+1);
77 test_truth(memcached_servers_count(local_memc->hosts) == x+1);

Subscribers

People subscribed via source and target branches

to all changes: