Fixed Oid/String parameter parsing on C++ end

John Haley · maxkorp · commit b5cddd2e9fd2 · 2014-12-01T14:49:50.000-07:00
diff --git a/generate/combyne/partials/async_function.cc b/generate/combyne/partials/async_function.cc
@@ -20,7 +20,7 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
   {%partial convertFromV8 arg%}
         {%if not arg.isPayload %}
   baton->{{ arg.name }} = from_{{ arg.name }};
-          {%if arg.cppClassName | isOid %}
+          {%if arg | isOid %}
   baton->{{ arg.name }}NeedsFree = args[{{ arg.jsArg }}]->IsString();
           {%endif%}
         {%endif%}
@@ -132,7 +132,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
       {%else%}
   free((void *)baton->{{ arg.name }});
       {%endif%}
-    {%elsif arg.cppClassName | isOid %}
+    {%elsif arg | isOid %}
   if (baton->{{ arg.name}}NeedsFree) {
     free((void *)baton->{{ arg.name }});
   }
diff --git a/generate/combyne/partials/sync_function.cc b/generate/combyne/partials/sync_function.cc
@@ -41,7 +41,7 @@ from_{{ arg.name }}
   {%each args|argsInfo as arg %}
     {%if arg.shouldAlloc %}
     free({{ arg.name }});
-    {%elsif arg.cppClassName | isOid %}
+    {%elsif arg | isOid %}
     if (args[{{ arg.jsArg }}]->IsString()) {
       free({{ arg.name }});
     }
@@ -57,9 +57,9 @@ from_{{ arg.name }}
 {%endif%}
 
 {%each args|argsInfo as arg %}
-  {%if arg.cppClassName | isOid %}
+  {%if arg | isOid %}
   if (args[{{ arg.jsArg }}]->IsString()) {
-    free(from_{{ arg.name }});
+    free(&from_{{ arg.name }});
   }
   {%endif%}
 {%endeach%}
diff --git a/generate/combyne/templates/class_header.h b/generate/combyne/templates/class_header.h
@@ -69,7 +69,7 @@ class {{ cppClassName }} : public ObjectWrap {
       {{ arg.cType|replace "**" "*" }} {{ arg.name }};
         {%else%}
       {{ arg.cType }} {{ arg.name }};
-          {%if arg.cppClassName | isOid %}
+          {%if arg | isOid %}
       bool {{ arg.name }}NeedsFree;
           {%endif%}
         {%endif%}
diff --git a/lib/repository.js b/lib/repository.js
@@ -308,13 +308,13 @@ Repository.prototype.getMasterCommit = function(callback) {
  * @param {Function} callback
  * @return {Commit}
  */
- Repository.prototype.getHeadCommit = function(callback) {
-   var repo = this;
+Repository.prototype.getHeadCommit = function(callback) {
+  var repo = this;
 
-   return Reference.nameToId(repo, "HEAD").then(function(head) {
-     return repo.getCommit(head, callback);
-   });
- };
+  return Reference.nameToId(repo, "HEAD").then(function(head) {
+    return repo.getCommit(head, callback);
+  });
+};
 
 /**
  * Create a commit
