diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-12 18:00:39 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-12 18:00:39 +0100 |
commit | 67f859104e0c89afc8263bb49173a5e9835d2c24 (patch) | |
tree | 94f863c0fde505ed6681e591afebe1c51501b713 /src/set/gnunet-service-set_union.c | |
parent | a2ac01f46c4d57034b5d40201b29701ff95b456a (diff) | |
download | gnunet-67f859104e0c89afc8263bb49173a5e9835d2c24.tar.gz gnunet-67f859104e0c89afc8263bb49173a5e9835d2c24.zip |
de-duplicate operation types
Diffstat (limited to 'src/set/gnunet-service-set_union.c')
-rw-r--r-- | src/set/gnunet-service-set_union.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 1ff3d7716..9eaf12fef 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -1211,7 +1211,7 @@ check_union_p2p_ibf (void *cls, | |||
1211 | struct Operation *op = cls; | 1211 | struct Operation *op = cls; |
1212 | unsigned int buckets_in_message; | 1212 | unsigned int buckets_in_message; |
1213 | 1213 | ||
1214 | if (OT_UNION != op->type) | 1214 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1215 | { | 1215 | { |
1216 | GNUNET_break_op (0); | 1216 | GNUNET_break_op (0); |
1217 | return GNUNET_SYSERR; | 1217 | return GNUNET_SYSERR; |
@@ -1447,7 +1447,7 @@ check_union_p2p_elements (void *cls, | |||
1447 | { | 1447 | { |
1448 | struct Operation *op = cls; | 1448 | struct Operation *op = cls; |
1449 | 1449 | ||
1450 | if (OT_UNION != op->type) | 1450 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1451 | { | 1451 | { |
1452 | GNUNET_break_op (0); | 1452 | GNUNET_break_op (0); |
1453 | return GNUNET_SYSERR; | 1453 | return GNUNET_SYSERR; |
@@ -1575,7 +1575,7 @@ check_union_p2p_full_element (void *cls, | |||
1575 | { | 1575 | { |
1576 | struct Operation *op = cls; | 1576 | struct Operation *op = cls; |
1577 | 1577 | ||
1578 | if (OT_UNION != op->type) | 1578 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1579 | { | 1579 | { |
1580 | GNUNET_break_op (0); | 1580 | GNUNET_break_op (0); |
1581 | return GNUNET_SYSERR; | 1581 | return GNUNET_SYSERR; |
@@ -1690,7 +1690,7 @@ check_union_p2p_inquiry (void *cls, | |||
1690 | struct Operation *op = cls; | 1690 | struct Operation *op = cls; |
1691 | unsigned int num_keys; | 1691 | unsigned int num_keys; |
1692 | 1692 | ||
1693 | if (OT_UNION != op->type) | 1693 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1694 | { | 1694 | { |
1695 | GNUNET_break_op (0); | 1695 | GNUNET_break_op (0); |
1696 | return GNUNET_SYSERR; | 1696 | return GNUNET_SYSERR; |
@@ -1790,7 +1790,7 @@ handle_union_p2p_request_full (void *cls, | |||
1790 | 1790 | ||
1791 | LOG (GNUNET_ERROR_TYPE_INFO, | 1791 | LOG (GNUNET_ERROR_TYPE_INFO, |
1792 | "Received request for full set transmission\n"); | 1792 | "Received request for full set transmission\n"); |
1793 | if (OT_UNION != op->type) | 1793 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1794 | { | 1794 | { |
1795 | GNUNET_break_op (0); | 1795 | GNUNET_break_op (0); |
1796 | fail_union_operation (op); | 1796 | fail_union_operation (op); |
@@ -1880,7 +1880,7 @@ check_union_p2p_demand (void *cls, | |||
1880 | struct Operation *op = cls; | 1880 | struct Operation *op = cls; |
1881 | unsigned int num_hashes; | 1881 | unsigned int num_hashes; |
1882 | 1882 | ||
1883 | if (OT_UNION != op->type) | 1883 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1884 | { | 1884 | { |
1885 | GNUNET_break_op (0); | 1885 | GNUNET_break_op (0); |
1886 | return GNUNET_SYSERR; | 1886 | return GNUNET_SYSERR; |
@@ -1984,7 +1984,7 @@ check_union_p2p_offer (void *cls, | |||
1984 | struct Operation *op = cls; | 1984 | struct Operation *op = cls; |
1985 | unsigned int num_hashes; | 1985 | unsigned int num_hashes; |
1986 | 1986 | ||
1987 | if (OT_UNION != op->type) | 1987 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
1988 | { | 1988 | { |
1989 | GNUNET_break_op (0); | 1989 | GNUNET_break_op (0); |
1990 | return GNUNET_SYSERR; | 1990 | return GNUNET_SYSERR; |
@@ -2079,7 +2079,7 @@ handle_union_p2p_done (void *cls, | |||
2079 | { | 2079 | { |
2080 | struct Operation *op = cls; | 2080 | struct Operation *op = cls; |
2081 | 2081 | ||
2082 | if (OT_UNION != op->type) | 2082 | if (GNUNET_SET_OPERATION_UNION != op->operation) |
2083 | { | 2083 | { |
2084 | GNUNET_break_op (0); | 2084 | GNUNET_break_op (0); |
2085 | fail_union_operation (op); | 2085 | fail_union_operation (op); |