You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by ma...@apache.org on 2010/03/05 20:38:43 UTC
svn commit: r919559 - in /hadoop/avro/trunk: ./ lang/c/examples/ lang/c/src/
lang/c/tests/
Author: massie
Date: Fri Mar 5 19:38:42 2010
New Revision: 919559
URL: http://svn.apache.org/viewvc?rev=919559&view=rev
Log:
AVRO-452. Include cleanup. Contributed by Bruce Mitchener.
Modified:
hadoop/avro/trunk/CHANGES.txt
hadoop/avro/trunk/lang/c/examples/quickstop.c
hadoop/avro/trunk/lang/c/src/avro_private.h
hadoop/avro/trunk/lang/c/src/datafile.c
hadoop/avro/trunk/lang/c/src/datum.c
hadoop/avro/trunk/lang/c/src/datum_equal.c
hadoop/avro/trunk/lang/c/src/datum_read.c
hadoop/avro/trunk/lang/c/src/datum_size.c
hadoop/avro/trunk/lang/c/src/datum_skip.c
hadoop/avro/trunk/lang/c/src/datum_validate.c
hadoop/avro/trunk/lang/c/src/datum_write.c
hadoop/avro/trunk/lang/c/src/dump.c
hadoop/avro/trunk/lang/c/src/encoding_binary.c
hadoop/avro/trunk/lang/c/src/io.c
hadoop/avro/trunk/lang/c/src/schema.c
hadoop/avro/trunk/lang/c/src/schema_equal.c
hadoop/avro/trunk/lang/c/src/schema_specific.c
hadoop/avro/trunk/lang/c/src/st.c
hadoop/avro/trunk/lang/c/tests/generate_interop_data.c
hadoop/avro/trunk/lang/c/tests/test_avro_data.c
hadoop/avro/trunk/lang/c/tests/test_avro_schema.c
hadoop/avro/trunk/lang/c/tests/test_interop_data.c
Modified: hadoop/avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Fri Mar 5 19:38:42 2010
@@ -30,6 +30,8 @@
AVRO-444. Fix warnings (Bruce Mitchener via massie)
+ AVRO-452. Include cleanup (Bruce Mitchener via massie)
+
BUG FIXES
AVRO-424. Fix the specification of the deflate codec.
Modified: hadoop/avro/trunk/lang/c/examples/quickstop.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/examples/quickstop.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/examples/quickstop.c (original)
+++ hadoop/avro/trunk/lang/c/examples/quickstop.c Fri Mar 5 19:38:42 2010
@@ -14,10 +14,11 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include <avro.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <avro.h>
avro_schema_t person_schema;
int64_t id = 0;
Modified: hadoop/avro/trunk/lang/c/src/avro_private.h
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/avro_private.h?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/avro_private.h (original)
+++ hadoop/avro/trunk/lang/c/src/avro_private.h Fri Mar 5 19:38:42 2010
@@ -17,7 +17,7 @@
#ifndef AVRO_PRIVATE_H
#define AVRO_PRIVATE_H
-#define sys_call(rval, call) do { rval = call; } while(rval < 0 && errno == EINTR)
+#include "avro.h"
#define check(rval, call) { rval = call; if(rval) return rval; }
Modified: hadoop/avro/trunk/lang/c/src/datafile.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datafile.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datafile.c (original)
+++ hadoop/avro/trunk/lang/c/src/datafile.c Fri Mar 5 19:38:42 2010
@@ -14,7 +14,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-#include <avro.h>
+
#include "avro_private.h"
#include "encoding.h"
#include <stdio.h>
Modified: hadoop/avro/trunk/lang/c/src/datum.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum.c Fri Mar 5 19:38:42 2010
@@ -14,10 +14,11 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "avro.h"
#include "datum.h"
#include "encoding.h"
Modified: hadoop/avro/trunk/lang/c/src/datum_equal.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_equal.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_equal.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_equal.c Fri Mar 5 19:38:42 2010
@@ -15,6 +15,7 @@
* permissions and limitations under the License.
*/
+#include "avro_private.h"
#include <string.h>
#include "datum.h"
Modified: hadoop/avro/trunk/lang/c/src/datum_read.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_read.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_read.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_read.c Fri Mar 5 19:38:42 2010
@@ -14,13 +14,14 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include "encoding.h"
#include "schema.h"
#include "datum.h"
-#include "avro_private.h"
int
avro_schema_match(avro_schema_t writers_schema, avro_schema_t readers_schema)
Modified: hadoop/avro/trunk/lang/c/src/datum_size.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_size.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_size.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_size.c Fri Mar 5 19:38:42 2010
@@ -14,6 +14,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <errno.h>
#include <assert.h>
#include <string.h>
Modified: hadoop/avro/trunk/lang/c/src/datum_skip.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_skip.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_skip.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_skip.c Fri Mar 5 19:38:42 2010
@@ -14,6 +14,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdlib.h>
#include <errno.h>
#include <string.h>
Modified: hadoop/avro/trunk/lang/c/src/datum_validate.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_validate.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_validate.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_validate.c Fri Mar 5 19:38:42 2010
@@ -14,6 +14,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <limits.h>
#include <errno.h>
#include <string.h>
Modified: hadoop/avro/trunk/lang/c/src/datum_write.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/datum_write.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/datum_write.c (original)
+++ hadoop/avro/trunk/lang/c/src/datum_write.c Fri Mar 5 19:38:42 2010
@@ -14,6 +14,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <errno.h>
#include <assert.h>
#include <string.h>
Modified: hadoop/avro/trunk/lang/c/src/dump.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/dump.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/dump.c (original)
+++ hadoop/avro/trunk/lang/c/src/dump.c Fri Mar 5 19:38:42 2010
@@ -15,10 +15,10 @@
* permissions and limitations under the License.
*/
+#include "avro_private.h"
#include "dump.h"
#include <ctype.h>
#include <string.h>
-#include <stdint.h>
static void dump_line(FILE * out, const caddr_t addr, const long len)
{
Modified: hadoop/avro/trunk/lang/c/src/encoding_binary.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/encoding_binary.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/encoding_binary.c (original)
+++ hadoop/avro/trunk/lang/c/src/encoding_binary.c Fri Mar 5 19:38:42 2010
@@ -14,6 +14,8 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include "encoding.h"
#include <stdlib.h>
#include <limits.h>
Modified: hadoop/avro/trunk/lang/c/src/io.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/io.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/io.c (original)
+++ hadoop/avro/trunk/lang/c/src/io.c Fri Mar 5 19:38:42 2010
@@ -14,13 +14,12 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
#include <errno.h>
#include <string.h>
-#include "avro.h"
-#include "avro_private.h"
#include "dump.h"
enum avro_io_type_t {
Modified: hadoop/avro/trunk/lang/c/src/schema.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/schema.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/schema.c (original)
+++ hadoop/avro/trunk/lang/c/src/schema.c Fri Mar 5 19:38:42 2010
@@ -14,12 +14,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include "avro.h"
#include "jansson.h"
#include "st.h"
#include "schema.h"
Modified: hadoop/avro/trunk/lang/c/src/schema_equal.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/schema_equal.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/schema_equal.c (original)
+++ hadoop/avro/trunk/lang/c/src/schema_equal.c Fri Mar 5 19:38:42 2010
@@ -15,6 +15,7 @@
* permissions and limitations under the License.
*/
+#include "avro_private.h"
#include "schema.h"
#include <string.h>
Modified: hadoop/avro/trunk/lang/c/src/schema_specific.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/schema_specific.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/schema_specific.c (original)
+++ hadoop/avro/trunk/lang/c/src/schema_specific.c Fri Mar 5 19:38:42 2010
@@ -15,10 +15,10 @@
* permissions and limitations under the License.
*/
+#include "avro_private.h"
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include "avro.h"
#include "schema.h"
enum specific_state {
Modified: hadoop/avro/trunk/lang/c/src/st.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/src/st.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/src/st.c (original)
+++ hadoop/avro/trunk/lang/c/src/st.c Fri Mar 5 19:38:42 2010
@@ -6,11 +6,12 @@
/*
* static char sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible";
*/
+
+#include "avro_private.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "st.h"
typedef struct st_table_entry st_table_entry;
Modified: hadoop/avro/trunk/lang/c/tests/generate_interop_data.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/tests/generate_interop_data.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/tests/generate_interop_data.c (original)
+++ hadoop/avro/trunk/lang/c/tests/generate_interop_data.c Fri Mar 5 19:38:42 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "avro_private.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <avro.h>
-#include "avro_private.h"
int main(int argc, char *argv[])
{
Modified: hadoop/avro/trunk/lang/c/tests/test_avro_data.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/tests/test_avro_data.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/tests/test_avro_data.c (original)
+++ hadoop/avro/trunk/lang/c/tests/test_avro_data.c Fri Mar 5 19:38:42 2010
@@ -14,12 +14,12 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdlib.h>
-#include <stdint.h>
#include <limits.h>
#include <time.h>
#include <string.h>
-#include "avro.h"
char buf[4096];
avro_reader_t reader;
Modified: hadoop/avro/trunk/lang/c/tests/test_avro_schema.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/tests/test_avro_schema.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/tests/test_avro_schema.c (original)
+++ hadoop/avro/trunk/lang/c/tests/test_avro_schema.c Fri Mar 5 19:38:42 2010
@@ -14,13 +14,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
+
+#include "avro_private.h"
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <dirent.h>
-#include "avro.h"
-
int test_cases = 0;
avro_writer_t avro_stderr;
Modified: hadoop/avro/trunk/lang/c/tests/test_interop_data.c
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c/tests/test_interop_data.c?rev=919559&r1=919558&r2=919559&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c/tests/test_interop_data.c (original)
+++ hadoop/avro/trunk/lang/c/tests/test_interop_data.c Fri Mar 5 19:38:42 2010
@@ -1,7 +1,6 @@
+#include "avro_private.h"
#include <stdio.h>
#include <unistd.h>
-#include <avro.h>
-#include "avro_private.h"
int main(void)
{