Drizzle Client & Protocol Library

Merge lp:~brianaker/libdrizzle/make-private-enum into lp:libdrizzle

  1. make-private-enum
  2. Merge into libdrizzle-redux
Proposed by Brian Aker
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 72
Merged at revision: 72
Proposed branch: lp:~brianaker/libdrizzle/make-private-enum
Merge into: lp:libdrizzle
Diff against target: 213 lines (+80/-76)
4 files modified
libdrizzle-5.1/conn_client.h (+0/-22)
libdrizzle-5.1/constants.h (+3/-54)
libdrizzle/conn_local.h (+22/-0)
libdrizzle/structs.h (+55/-0)
To merge this branch: bzr merge lp:~brianaker/libdrizzle/make-private-enum
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+141466@code.launchpad.net

Description of the change

Make private a number of enum which are not user controlled.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdrizzle-5.1/conn_client.h'
2--- libdrizzle-5.1/conn_client.h 2012-12-22 08:54:15 +0000
3+++ libdrizzle-5.1/conn_client.h 2012-12-29 21:48:21 +0000
4@@ -120,28 +120,6 @@
5 drizzle_result_st *drizzle_ping(drizzle_st *con,
6 drizzle_return_t *ret_ptr);
7
8-/**
9- * Send raw command to server, possibly in parts.
10- *
11- * @param[in] con Connection structure previously initialized with
12- * drizzle_create(), drizzle_clone(), or related functions.
13- * @param[in] result Caller allocated structure, or NULL to allocate one.
14- * @param[in] command Command to run on server.
15- * @param[in] data Data to send along with the command.
16- * @param[in] size Size of the current chunk of data being sent.
17- * @param[in] total Total size of all data being sent for command.
18- * @param[out] ret_ptr Standard drizzle return value.
19- * @return On success, a pointer to the (possibly allocated) structure. On
20- * failure this will be NULL.
21- */
22-DRIZZLE_API
23-drizzle_result_st *drizzle_command_write(drizzle_st *con,
24- drizzle_result_st *result,
25- drizzle_command_t command,
26- const void *data, size_t size,
27- size_t total,
28- drizzle_return_t *ret_ptr);
29-
30 /** @} */
31
32 #ifdef __cplusplus
33
34=== modified file 'libdrizzle-5.1/constants.h'
35--- libdrizzle-5.1/constants.h 2012-12-29 20:26:36 +0000
36+++ libdrizzle-5.1/constants.h 2012-12-29 21:48:21 +0000
37@@ -60,6 +60,9 @@
38 /* Defines. */
39 #define DRIZZLE_DEFAULT_TCP_HOST "localhost"
40 #define DRIZZLE_DEFAULT_TCP_PORT 3306
41+#define DRIZZLE_MYSQL_TCP_PORT 3306
42+#define DRIZZLE_DRIZZLE_TCP_PORT 4427
43+#define DRIZZLE_DEFAULT_TCP_SERVICE "mysql"
44 #define DRIZZLE_DEFAULT_UDS "/tmp/mysql.sock"
45 #define DRIZZLE_DEFAULT_BACKLOG 64
46 #define DRIZZLE_MAX_ERROR_SIZE 2048
47@@ -115,16 +118,6 @@
48 typedef enum drizzle_options_t drizzle_options_t;
49 #endif
50
51-/**
52- * @ingroup drizzle_con
53- * Socket types for drizzle_st.
54- */
55-enum drizzle_socket_t
56-{
57- DRIZZLE_CON_SOCKET_TCP= 0,
58- DRIZZLE_CON_SOCKET_UDS= (1 << 0)
59-};
60-
61 #ifndef __cplusplus
62 typedef enum drizzle_socket_t drizzle_socket_t;
63 #endif
64@@ -196,50 +189,6 @@
65 #endif
66
67 /**
68- * @ingroup drizzle_command
69- * Commands for drizzle_command functions.
70- */
71-enum drizzle_command_t
72-{
73- DRIZZLE_COMMAND_SLEEP, /* Not used currently. */
74- DRIZZLE_COMMAND_QUIT,
75- DRIZZLE_COMMAND_INIT_DB,
76- DRIZZLE_COMMAND_QUERY,
77- DRIZZLE_COMMAND_FIELD_LIST, /* Deprecated. */
78- DRIZZLE_COMMAND_CREATE_DB, /* Deprecated. */
79- DRIZZLE_COMMAND_DROP_DB, /* Deprecated. */
80- DRIZZLE_COMMAND_REFRESH,
81- DRIZZLE_COMMAND_SHUTDOWN,
82- DRIZZLE_COMMAND_STATISTICS,
83- DRIZZLE_COMMAND_PROCESS_INFO, /* Deprecated. */
84- DRIZZLE_COMMAND_CONNECT, /* Not used currently. */
85- DRIZZLE_COMMAND_PROCESS_KILL, /* Deprecated. */
86- DRIZZLE_COMMAND_DEBUG,
87- DRIZZLE_COMMAND_PING,
88- DRIZZLE_COMMAND_TIME, /* Not used currently. */
89- DRIZZLE_COMMAND_DELAYED_INSERT, /* Not used currently. */
90- DRIZZLE_COMMAND_CHANGE_USER,
91- DRIZZLE_COMMAND_BINLOG_DUMP, /* Not used currently. */
92- DRIZZLE_COMMAND_TABLE_DUMP, /* Not used currently. */
93- DRIZZLE_COMMAND_CONNECT_OUT, /* Not used currently. */
94- DRIZZLE_COMMAND_REGISTER_SLAVE, /* Not used currently. */
95- DRIZZLE_COMMAND_STMT_PREPARE,
96- DRIZZLE_COMMAND_STMT_EXECUTE,
97- DRIZZLE_COMMAND_STMT_SEND_LONG_DATA,
98- DRIZZLE_COMMAND_STMT_CLOSE,
99- DRIZZLE_COMMAND_STMT_RESET,
100- DRIZZLE_COMMAND_SET_OPTION, /* Not used currently. */
101- DRIZZLE_COMMAND_STMT_FETCH,
102- DRIZZLE_COMMAND_DAEMON, /* Not used currently. */
103- DRIZZLE_COMMAND_BINLOG_DUMP_GTID,
104- DRIZZLE_COMMAND_END /* Not used currently. */
105-};
106-
107-#ifndef __cplusplus
108-typedef enum drizzle_command_t drizzle_command_t;
109-#endif
110-
111-/**
112 * @ingroup drizzle_result
113 * Options for drizzle_result_st.
114 */
115
116=== modified file 'libdrizzle/conn_local.h'
117--- libdrizzle/conn_local.h 2012-12-22 08:54:15 +0000
118+++ libdrizzle/conn_local.h 2012-12-29 21:48:21 +0000
119@@ -60,6 +60,28 @@
120 */
121 DRIZZLE_LOCAL
122 void drizzle_reset_addrinfo(drizzle_st *con);
123+
124+/**
125+ * Send raw command to server, possibly in parts.
126+ *
127+ * @param[in] con Connection structure previously initialized with
128+ * drizzle_create(), drizzle_clone(), or related functions.
129+ * @param[in] result Caller allocated structure, or NULL to allocate one.
130+ * @param[in] command Command to run on server.
131+ * @param[in] data Data to send along with the command.
132+ * @param[in] size Size of the current chunk of data being sent.
133+ * @param[in] total Total size of all data being sent for command.
134+ * @param[out] ret_ptr Standard drizzle return value.
135+ * @return On success, a pointer to the (possibly allocated) structure. On
136+ * failure this will be NULL.
137+ */
138+DRIZZLE_LOCAL
139+drizzle_result_st *drizzle_command_write(drizzle_st *con,
140+ drizzle_result_st *result,
141+ drizzle_command_t command,
142+ const void *data, size_t size,
143+ size_t total,
144+ drizzle_return_t *ret_ptr);
145
146 /**
147 * Check if state stack is empty.
148
149=== modified file 'libdrizzle/structs.h'
150--- libdrizzle/structs.h 2012-12-29 16:29:59 +0000
151+++ libdrizzle/structs.h 2012-12-29 21:48:21 +0000
152@@ -61,6 +61,61 @@
153 #endif
154
155 /**
156+ * @ingroup drizzle_command
157+ * Commands for drizzle_command functions.
158+ */
159+enum drizzle_command_t
160+{
161+ DRIZZLE_COMMAND_SLEEP, /* Not used currently. */
162+ DRIZZLE_COMMAND_QUIT,
163+ DRIZZLE_COMMAND_INIT_DB,
164+ DRIZZLE_COMMAND_QUERY,
165+ DRIZZLE_COMMAND_FIELD_LIST, /* Deprecated. */
166+ DRIZZLE_COMMAND_CREATE_DB, /* Deprecated. */
167+ DRIZZLE_COMMAND_DROP_DB, /* Deprecated. */
168+ DRIZZLE_COMMAND_REFRESH,
169+ DRIZZLE_COMMAND_SHUTDOWN,
170+ DRIZZLE_COMMAND_STATISTICS,
171+ DRIZZLE_COMMAND_PROCESS_INFO, /* Deprecated. */
172+ DRIZZLE_COMMAND_CONNECT, /* Not used currently. */
173+ DRIZZLE_COMMAND_PROCESS_KILL, /* Deprecated. */
174+ DRIZZLE_COMMAND_DEBUG,
175+ DRIZZLE_COMMAND_PING,
176+ DRIZZLE_COMMAND_TIME, /* Not used currently. */
177+ DRIZZLE_COMMAND_DELAYED_INSERT, /* Not used currently. */
178+ DRIZZLE_COMMAND_CHANGE_USER,
179+ DRIZZLE_COMMAND_BINLOG_DUMP, /* Not used currently. */
180+ DRIZZLE_COMMAND_TABLE_DUMP, /* Not used currently. */
181+ DRIZZLE_COMMAND_CONNECT_OUT, /* Not used currently. */
182+ DRIZZLE_COMMAND_REGISTER_SLAVE, /* Not used currently. */
183+ DRIZZLE_COMMAND_STMT_PREPARE,
184+ DRIZZLE_COMMAND_STMT_EXECUTE,
185+ DRIZZLE_COMMAND_STMT_SEND_LONG_DATA,
186+ DRIZZLE_COMMAND_STMT_CLOSE,
187+ DRIZZLE_COMMAND_STMT_RESET,
188+ DRIZZLE_COMMAND_SET_OPTION, /* Not used currently. */
189+ DRIZZLE_COMMAND_STMT_FETCH,
190+ DRIZZLE_COMMAND_DAEMON, /* Not used currently. */
191+ DRIZZLE_COMMAND_BINLOG_DUMP_GTID,
192+ DRIZZLE_COMMAND_END /* Not used currently. */
193+};
194+
195+#ifndef __cplusplus
196+typedef enum drizzle_command_t drizzle_command_t;
197+#endif
198+
199+
200+/**
201+ * @ingroup drizzle_con
202+ * Socket types for drizzle_st.
203+ */
204+enum drizzle_socket_t
205+{
206+ DRIZZLE_CON_SOCKET_TCP,
207+ DRIZZLE_CON_SOCKET_UDS
208+};
209+
210+/**
211 * @ingroup drizzle_con
212 */
213 struct drizzle_tcp_st

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: