inline AbortConnection

brianc · brianc · commit 863a1ba85c04 · 2011-04-14T22:42:35.000-05:00
diff --git a/src/binding.cc b/src/binding.cc
@@ -105,7 +105,8 @@ class Connection : public EventEmitter {
     String::Utf8Value conninfo(args[0]->ToString());
     bool success = self->Connect(*conninfo);
     if(!success) {
-      self -> AbortConnection();
+      self -> EmitLastError();
+      self -> DestroyConnection();
     }
 
     return Undefined();
@@ -282,13 +283,6 @@ class Connection : public EventEmitter {
     }
   }
 
-  //aborts connection and returns connection error message
-  void AbortConnection()
-  {
-    EmitLastError();
-    DestroyConnection();
-  }
-
   //safely destroys the connection at most 1 time
   void DestroyConnection()
   {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ class Connection : public EventEmitter {`
`105`	`105`	`String::Utf8Value conninfo(args[0]->ToString());`
`106`	`106`	`bool success = self->Connect(*conninfo);`
`107`	`107`	`if(!success) {`
`108`		`- self -> AbortConnection();`
	`108`	`+ self -> EmitLastError();`
	`109`	`+ self -> DestroyConnection();`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`return Undefined();`
`@@ -282,13 +283,6 @@ class Connection : public EventEmitter {`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`
`285`		`- //aborts connection and returns connection error message`
`286`		`- void AbortConnection()`
`287`		`- {`
`288`		`- EmitLastError();`
`289`		`- DestroyConnection();`
`290`		`- }`
`291`		`-`
`292`	`286`	`//safely destroys the connection at most 1 time`
`293`	`287`	`void DestroyConnection()`
`294`	`288`	`{`