update source according to CAPI naming rule

Change-Id: If3af7c2af50bef8234d8531735dc7e8ed50ab408

diff --git a/inc/nltk_native_library.h b/inc/nltk_native_library.h
index 6835914..b0561bd 100644 (file)
--- a/inc/nltk_native_library.h
+++ b/inc/nltk_native_library.h
@@ -14,19 +14,19 @@ extern "C" {
 #endif
 
 // This method is exported from nltk_native_library.so
-EXPORT_API void nltk_initialize();
-EXPORT_API void nltk_finalize();
-EXPORT_API PyObject* nltk_getModule(char* m_name);
-EXPORT_API PyObject* nltk_getFunctionHandle(PyObject* m_module , char * f_name);
-EXPORT_API PyObject* nltk_makeArgsFromPyObject(PyObject* pyobj);
-EXPORT_API PyObject* nltk_makeArgsFromString(char* info);
-EXPORT_API PyObject* nltk_callFunctionWithArgs(PyObject* m_func, PyObject* args);
-EXPORT_API int nltk_getSizeFromList(PyObject* list);
-EXPORT_API int nltk_getSizeFromTuple(PyObject* tuple);
-EXPORT_API PyObject* nltk_getElementFromTupleByIndex(PyObject* tuple, int index);
-EXPORT_API PyObject* nltk_getElementFromListByIndex(PyObject* list, int index);
-EXPORT_API char* nltk_getStringFromElement(PyObject* elm);
-EXPORT_API char* nltk_getattrib(int z);
+EXPORT_API void nltk_initialize(void);
+EXPORT_API void nltk_finalize(void);
+EXPORT_API PyObject* nltk_get_module(char* module_name);
+EXPORT_API PyObject* nltk_get_function_handle(PyObject* module , char * func_name);
+EXPORT_API PyObject* nltk_make_args_from_pyobject(PyObject* pyobj);
+EXPORT_API PyObject* nltk_make_args_from_string(char* info);
+EXPORT_API PyObject* nltk_call_function_with_args(PyObject* func, PyObject* args);
+EXPORT_API int nltk_get_size_from_list(PyObject* list);
+EXPORT_API int nltk_get_size_from_tuple(PyObject* tuple);
+EXPORT_API PyObject* nltk_get_element_from_tuple_by_index(PyObject* tuple, int index);
+EXPORT_API PyObject* nltk_get_element_from_list_by_index(PyObject* list, int index);
+EXPORT_API char* nltk_get_string_from_element(PyObject* elm);
+EXPORT_API char* nltk_get_attribute(void);
 
 #ifdef __cplusplus
 }

diff --git a/src/nltk_native_library.c b/src/nltk_native_library.c
index 7e7c914..4541764 100644 (file)
--- a/src/nltk_native_library.c
+++ b/src/nltk_native_library.c
@@ -4,22 +4,22 @@
 #include "nltk_native_library.h"
 
 // This is an example of an exported method.
-void nltk_initialize()
+void nltk_initialize(void)
 {
     Py_Initialize();
 }
 
-void nltk_finalize()
+void nltk_finalize(void)
 {
     Py_Finalize();
 }
 
-PyObject* nltk_getModule(char* m_name)
+PyObject* nltk_get_module(char* module_name)
 {
-    return PyImport_ImportModuleNoBlock(m_name);
+    return PyImport_ImportModuleNoBlock(module_name);
 }
 
-int nltk_getSizeFromList(PyObject* list)
+int nltk_get_size_from_list(PyObject* list)
 {
     if PyList_Check(list)
     {
@@ -31,7 +31,7 @@ int nltk_getSizeFromList(PyObject* list)
     }
 }
 
-int nltk_getSizeFromTuple(PyObject* tuple)
+int nltk_get_size_from_tuple(PyObject* tuple)
 {
     if PyTuple_Check(tuple)
     {
@@ -43,7 +43,7 @@ int nltk_getSizeFromTuple(PyObject* tuple)
     }
 }
 
-PyObject* nltk_getElementFromListByIndex(PyObject* list, int index)
+PyObject* nltk_get_element_from_list_by_index(PyObject* list, int index)
 {
     PyObject* element;
     if PyList_Check(list)
@@ -70,7 +70,7 @@ char* nltk_getStringFromListElement(PyObject* elm)
     return PyString_AsString(elm);
 }
 
-PyObject* nltk_getElementFromTupleByIndex(PyObject* tuple, int index)
+PyObject* nltk_get_element_from_tuple_by_index(PyObject* tuple, int index)
 {
     PyObject* element;
     if PyTuple_Check(tuple)
@@ -92,19 +92,19 @@ PyObject* nltk_getElementFromTupleByIndex(PyObject* tuple, int index)
     return element;
 }
 
-char* nltk_getStringFromElement(PyObject* elm)
+char* nltk_get_string_from_element(PyObject* elm)
 {
     char* ch = (char*) malloc(255);
     strcpy(ch, PyString_AsString(elm));
     return ch;
 }
 
-PyObject* nltk_getFunctionHandle(PyObject* m_module, char *f_name)
+PyObject* nltk_get_function_handle(PyObject* module, char *func_name)
 {
-    return PyObject_GetAttrString(m_module, f_name);
+    return PyObject_GetAttrString(module, func_name);
 }
 
-PyObject* nltk_makeArgsFromString(char* info)
+PyObject* nltk_make_args_from_string(char* info)
 {
     PyObject *pArgs;
     //create args tuple struct to fill the arg one by one  ,here , only create one string with 1
@@ -113,7 +113,7 @@ PyObject* nltk_makeArgsFromString(char* info)
     return pArgs;
 }
 
-PyObject* nltk_makeArgsFromPyObject(PyObject* pyobj)
+PyObject* nltk_make_args_from_pyobject(PyObject* pyobj)
 {
     PyObject *pArgs;
     //create args tuple struct to fill the arg one by one  ,here ,only create one python object with 1
@@ -123,13 +123,13 @@ PyObject* nltk_makeArgsFromPyObject(PyObject* pyobj)
     return pArgs;
 }
 
-PyObject* nltk_callFunctionWithArgs(PyObject* m_func, PyObject* args)
+PyObject* nltk_call_function_with_args(PyObject* func, PyObject* args)
 {
-    return PyObject_CallObject(m_func, args);
+    return PyObject_CallObject(func, args);
 }
 
 // This is an example of an method to get attribute of module.
-char* nltk_getattrib(int z)
+char* nltk_get_attribute(void)
 {
     PyObject *pModule, *pFunc;
     PyObject *pArgs;
@@ -139,16 +139,16 @@ char* nltk_getattrib(int z)
         pModule = PyImport_ImportModule("site");
         if (pModule != NULL)
         {
-        //create args tuple struct to fill the arg one by one  ,here ,only create one param with 1
-        pArgs = PyTuple_New(1);
-        //set a string for item 0 of tuple
-        PyTuple_SetItem(pArgs, 0, PyString_FromString("Hello World"));
-        //call word_tokenize func with args
-        pFunc = PyObject_GetAttrString(pModule, "USER_SITE");
-        if (pFunc != NULL) {
-            strcpy(ch, PyString_AsString(pFunc));
+            //create args tuple struct to fill the arg one by one  ,here ,only create one param with 1
+            pArgs = PyTuple_New(1);
+            //set a string for item 0 of tuple
+            PyTuple_SetItem(pArgs, 0, PyString_FromString("Hello World"));
+            //call word_tokenize func with args
+            pFunc = PyObject_GetAttrString(pModule, "USER_SITE");
+            if (pFunc != NULL) {
+                strcpy(ch, PyString_AsString(pFunc));
             } else {
-            strcpy(ch, "attribute get error\n");
+                strcpy(ch, "attribute get error\n");
             }
         } else {
             strcpy(ch, "nltk module import error\n");