hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert avro headers to .hh

Browse Source 
Required for converting maxscale/buffer.h.
This commit is contained in:
Esa Korhonen
2019-01-15 16:30:54 +02:00
parent dae99b2acd
commit 6a23015b64
13 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avro/maxavro.cc
View File

@ -14,7 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include "maxavro_internal.h" #include "maxavro_internal.hh"
#include <maxbase/assert.h> #include <maxbase/assert.h>
#include <maxscale/log.hh> #include <maxscale/log.hh>
#include <errno.h> #include <errno.h>

6
avro/maxavro.h → avro/maxavro.hh
View File

@ -17,9 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <jansson.h> #include <jansson.h>
#include <maxscale/buffer.h> #include <maxscale/buffer.hh>
MXS_BEGIN_DECLS
/** File magic and sync marker sizes block sizes */ /** File magic and sync marker sizes block sizes */
#define AVRO_MAGIC_SIZE 4 #define AVRO_MAGIC_SIZE 4
@ -155,5 +153,3 @@ GWBUF* maxavro_file_binary_header(MAXAVRO_FILE* file);
/** File error functions */ /** File error functions */
enum maxavro_error maxavro_get_error(MAXAVRO_FILE* file); enum maxavro_error maxavro_get_error(MAXAVRO_FILE* file);
const char* maxavro_get_error_string(MAXAVRO_FILE* file); const char* maxavro_get_error_string(MAXAVRO_FILE* file);
MXS_END_DECLS

2
avro/maxavro_datablock.cc
View File

@ -11,7 +11,7 @@
* Public License. * Public License.
*/ */
#include "maxavro.h" #include "maxavro.hh"
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>

2
avro/maxavro_file.cc
View File

@ -11,7 +11,7 @@
* Public License. * Public License.
*/ */
#include "maxavro_internal.h" #include "maxavro_internal.hh"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <maxbase/assert.h> #include <maxbase/assert.h>

4
avro/maxavro_internal.h → avro/maxavro_internal.hh
View File

@ -13,8 +13,8 @@
#pragma once #pragma once
#include "maxavro.h" #include "maxavro.hh"
#include <maxscale/alloc.h> #include <maxbase/alloc.h>
/** /**
* Private header for maxavro * Private header for maxavro

2
avro/maxavro_record.cc
View File

@ -12,7 +12,7 @@
*/ */
#include <maxscale/cdefs.h> #include <maxscale/cdefs.h>
#include "maxavro_internal.h" #include "maxavro_internal.hh"
#include <string.h> #include <string.h>
#include <maxbase/assert.h> #include <maxbase/assert.h>
#include <maxscale/log.hh> #include <maxscale/log.hh>

2
avro/maxavro_schema.cc
View File

@ -11,7 +11,7 @@
* Public License. * Public License.
*/ */
#include "maxavro_internal.h" #include "maxavro_internal.hh"
#include <jansson.h> #include <jansson.h>
#include <string.h> #include <string.h>
#include <maxbase/assert.h> #include <maxbase/assert.h>

2
avro/maxavro_write.cc
View File

@ -14,7 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include "maxavro_internal.h" #include "maxavro_internal.hh"
#include <maxscale/log.hh> #include <maxscale/log.hh>
#include <errno.h> #include <errno.h>

2
avro/maxavrocheck.cc
View File

@ -15,7 +15,7 @@
* @file maxavrocheck.c - Simple Avro file validator * @file maxavrocheck.c - Simple Avro file validator
*/ */
#include <maxavro.h> #include <maxavro.hh>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>

2
avro/test/CMakeLists.txt
View File

@ -1,3 +1,3 @@
add_executable(test_values test_values.c) add_executable(test_values test_values.cc)
target_link_libraries(test_values maxavro) target_link_libraries(test_values maxavro)

2
avro/test/test_values.c → avro/test/test_values.cc
View File

@ -11,7 +11,7 @@
* Public License. * Public License.
*/ */
#include <maxavro.h> #include <maxavro.hh>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>

2
server/modules/routing/avrorouter/avro_client.cc
View File

@ -21,7 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <maxavro.h> #include <maxavro.hh>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <maxscale/service.hh> #include <maxscale/service.hh>

2
server/modules/routing/avrorouter/avrorouter.hh
View File

@ -25,7 +25,7 @@
#include <maxscale/mysql_binlog.h> #include <maxscale/mysql_binlog.h>
#include <maxscale/users.h> #include <maxscale/users.h>
#include <cdc.hh> #include <cdc.hh>
#include <maxavro.h> #include <maxavro.hh>
#include <binlog_common.hh> #include <binlog_common.hh>
#include <maxscale/protocol/mysql.hh> #include <maxscale/protocol/mysql.hh>
#include <blr_constants.hh> #include <blr_constants.hh>