Satisfy C90 pedantry in Python adapter

hfutxrl2011 · Apr 3, 2015 · 660a33e · 660a33e
1 parent a4b0909
commit 660a33e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/src/python/src/grpc/_adapter/_call.c b/src/python/src/grpc/_adapter/_call.c
@@ -164,10 +164,10 @@ static const PyObject *pygrpc_call_add_metadata(Call *self, PyObject *args) {
   const char* key = NULL;
   const char* value = NULL;
   int value_length = 0;
+  grpc_metadata metadata;
   if (!PyArg_ParseTuple(args, "ss#", &key, &value, &value_length)) {
     return NULL;
   }
-  grpc_metadata metadata;
   metadata.key = key;
   metadata.value = value;
   metadata.value_length = value_length;

diff --git a/src/python/src/grpc/_adapter/_call.h b/src/python/src/grpc/_adapter/_call.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_call *c_call;
 } Call;
 

diff --git a/src/python/src/grpc/_adapter/_channel.h b/src/python/src/grpc/_adapter/_channel.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_channel *c_channel;
 } Channel;
 

diff --git a/src/python/src/grpc/_adapter/_client_credentials.h b/src/python/src/grpc/_adapter/_client_credentials.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc_security.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_credentials *c_client_credentials;
 } ClientCredentials;
 

diff --git a/src/python/src/grpc/_adapter/_completion_queue.c b/src/python/src/grpc/_adapter/_completion_queue.c
@@ -124,7 +124,7 @@ static PyObject *pygrpc_metadata_collection_get(
     PyObject *key = PyString_FromString(elem.key);
     PyObject *value = PyString_FromStringAndSize(elem.value, elem.value_length);
     PyObject* kvp = PyTuple_Pack(2, key, value);
-    // n.b. PyList_SetItem *steals* a reference to the set element.
+    /* n.b. PyList_SetItem *steals* a reference to the set element. */
     PyList_SetItem(metadata, i, kvp);
     Py_DECREF(key);
     Py_DECREF(value);
@@ -266,6 +266,7 @@ static PyObject *pygrpc_finished_event_args(grpc_event *c_event) {
   PyObject *details;
   PyObject *status;
   PyObject *event_args;
+  PyObject *metadata;
 
   code = pygrpc_status_code(c_event->data.finished.status);
   if (code == NULL) {
@@ -285,7 +286,7 @@ static PyObject *pygrpc_finished_event_args(grpc_event *c_event) {
   if (status == NULL) {
     return NULL;
   }
-  PyObject* metadata = pygrpc_metadata_collection_get(
+  metadata = pygrpc_metadata_collection_get(
       c_event->data.finished.metadata_elements,
       c_event->data.finished.metadata_count);
   event_args = PyTuple_Pack(8, finish_event_kind, (PyObject *)c_event->tag,

diff --git a/src/python/src/grpc/_adapter/_completion_queue.h b/src/python/src/grpc/_adapter/_completion_queue.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_completion_queue *c_completion_queue;
 } CompletionQueue;
 

diff --git a/src/python/src/grpc/_adapter/_server.h b/src/python/src/grpc/_adapter/_server.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_server *c_server;
 } Server;
 

diff --git a/src/python/src/grpc/_adapter/_server_credentials.h b/src/python/src/grpc/_adapter/_server_credentials.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc_security.h>
 
 typedef struct {
-  PyObject_HEAD;
+  PyObject_HEAD
   grpc_server_credentials *c_server_credentials;
 } ServerCredentials;