use snake-case in C

Author: ry

binding.cc

@@ -13,7 +13,7 @@ struct worker_s {
   int x;
   void* data;
   worker_recv_cb cb;
-  worker_recvSync_cb req_cb;
+  worker_recv_sync_cb sync_cb;
   Isolate* isolate;
   std::string last_exception;
   Persistent<Function> recv;
@@ -104,7 +104,7 @@ void go_recv_cb(const char* msg, void* data) {
   recvCb((char*)msg, data);
 }
 
-const char* go_recvSync_cb(const char* msg, void* data) {
+const char* go_recv_sync_cb(const char* msg, void* data) {
   return recvSyncCb((char*)msg, data);
 }
 
@@ -250,7 +250,7 @@ void SendSync(const FunctionCallbackInfo<Value>& args) {
     String::Utf8Value str(v);
     msg = ToCString(str);
   }
-  const char* returnMsg = w->req_cb(msg.c_str(), w->data);
+  const char* returnMsg = w->sync_cb(msg.c_str(), w->data);
   Local<String> returnV = String::NewFromUtf8(w->isolate, returnMsg);
   args.GetReturnValue().Set(returnV);
 }
@@ -290,7 +290,7 @@ int worker_send(worker* w, const char* msg) {
 
 // Called from golang. Must route message to javascript lang.
 // It will call the $recv_sync_handler callback function and return its string value.
-const char* worker_sendSync(worker* w, const char* msg) {
+const char* worker_send_sync(worker* w, const char* msg) {
   std::string out;
   Locker locker(w->isolate);
   Isolate::Scope isolate_scope(w->isolate);
@@ -329,7 +329,7 @@ void v8_init() {
   V8::SetArrayBufferAllocator(&array_buffer_allocator);
 }
 
-worker* worker_new(worker_recv_cb cb, worker_recvSync_cb recvSync_cb, void* data) {
+worker* worker_new(worker_recv_cb cb, worker_recv_sync_cb sync_cb, void* data) {
   Isolate* isolate = Isolate::New();
   Locker locker(isolate);
   Isolate::Scope isolate_scope(isolate);
@@ -341,7 +341,7 @@ worker* worker_new(worker_recv_cb cb, worker_recvSync_cb recvSync_cb, void* data
   w->isolate->SetData(0, w);
   w->data = data;
   w->cb = cb;
-  w->req_cb = recvSync_cb;
+  w->sync_cb = sync_cb;
 
   Local<ObjectTemplate> global = ObjectTemplate::New(w->isolate);
 

binding.h

@@ -4,18 +4,18 @@ extern "C" {
 
 
 void go_recv_cb(const char* msg, void* data);
-const char* go_recvSync_cb(const char* msg, void* data);
+const char* go_recv_sync_cb(const char* msg, void* data);
 
 struct worker_s;
 typedef struct worker_s worker;
 typedef void (*worker_recv_cb)(const char* msg, void* data);
-typedef const char* (*worker_recvSync_cb)(const char* msg, void* data);
+typedef const char* (*worker_recv_sync_cb)(const char* msg, void* data);
 
 const char* worker_version();
 
 void v8_init();
 
-worker* worker_new(worker_recv_cb cb, worker_recvSync_cb recvSync_cb, void* data);
+worker* worker_new(worker_recv_cb cb, worker_recv_sync_cb sync_cb, void* data);
 
 // returns nonzero on error
 // get error from worker_last_exception
@@ -24,7 +24,7 @@ int worker_load(worker* w, char* name_s, char* source_s);
 const char* worker_last_exception(worker* w);
 
 int worker_send(worker* w, const char* msg);
-const char* worker_sendSync(worker* w, const char* msg);
+const char* worker_send_sync(worker* w, const char* msg);
 
 void worker_dispose(worker* w);
 

worker.go

@@ -27,9 +27,9 @@ var initV8Once sync.Once
 
 // This is a golang wrapper around a single V8 Isolate.
 type Worker struct {
-	cWorker     *C.worker
-	cb          ReceiveMessageCallback
-	recvSync_cb ReceiveSyncMessageCallback
+	cWorker *C.worker
+	cb      ReceiveMessageCallback
+	sync_cb ReceiveSyncMessageCallback
 }
 
 // Return the V8 version E.G. "4.3.59"
@@ -48,24 +48,24 @@ func recvCb(msg_s *C.char, ptr unsafe.Pointer) {
 func recvSyncCb(msg_s *C.char, ptr unsafe.Pointer) *C.char {
 	msg := C.GoString(msg_s)
 	worker := (*Worker)(ptr)
-	return_s := C.CString(worker.recvSync_cb(msg))
+	return_s := C.CString(worker.sync_cb(msg))
 	return return_s
 }
 
 // Creates a new worker, which corresponds to a V8 isolate. A single threaded
 // standalone execution context.
-func New(cb ReceiveMessageCallback, recvSync_cb ReceiveSyncMessageCallback) *Worker {
+func New(cb ReceiveMessageCallback, sync_cb ReceiveSyncMessageCallback) *Worker {
 	worker := &Worker{
-		cb:          cb,
-		recvSync_cb: recvSync_cb,
+		cb:      cb,
+		sync_cb: sync_cb,
 	}
 
 	initV8Once.Do(func() {
 		C.v8_init()
 	})
 
 	callback := C.worker_recv_cb(C.go_recv_cb)
-	receiveSync_callback := C.worker_recvSync_cb(C.go_recvSync_cb)
+	receiveSync_callback := C.worker_recv_sync_cb(C.go_recv_sync_cb)
 
 	worker.cWorker = C.worker_new(callback, receiveSync_callback, unsafe.Pointer(worker))
 	runtime.SetFinalizer(worker, func(final_worker *Worker) {
@@ -110,6 +110,6 @@ func (w *Worker) SendSync(msg string) string {
 	msg_s := C.CString(string(msg))
 	defer C.free(unsafe.Pointer(msg_s))
 
-	svalue := C.worker_sendSync(w.cWorker, msg_s)
+	svalue := C.worker_send_sync(w.cWorker, msg_s)
 	return C.GoString(svalue)
 }