Skip to content

Duplicate git_error struct before passing it on #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkallen merged 2 commits into from
Oct 9, 2013
Merged

Duplicate git_error struct before passing it on #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694adc5
Duplicate git_error before passing it on as it will cross a thread bo…
papandreou Oct 8, 2013
29276d5
Regenerated sources.
papandreou Oct 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/functions/copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#include <v8.h>

#include <string.h>

#include "git2.h"

#ifndef COPY_FUNCTIONS
#define COPY_FUNCTIONS

const git_error *git_error_dup(const git_error *arg);
const git_oid *git_oid_dup(const git_oid *arg);
const git_index_entry *git_index_entry_dup(const git_index_entry *arg);
const git_index_time *git_index_time_dup(const git_index_time *arg);
Expand Down
8 changes: 8 additions & 0 deletions src/functions/copy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
#include <string>
#include <cstring>

#include "git2.h"

const git_error *git_error_dup(const git_error *arg) {
git_error *result = (git_error *)malloc(sizeof(git_error));
result->klass = arg->klass;
result->message = strdup(arg->message);
return result;
}

const git_oid *git_oid_dup(const git_oid *arg) {
git_oid *result = (git_oid *)malloc(sizeof(git_oid));
git_oid_cpy(result, arg);
Expand Down
28 changes: 21 additions & 7 deletions src/index.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ git_index *GitIndex::GetValue() {
}


#include "../include/functions/copy.h"

/**
* @param {String} index_path
* @param {Index} callback
Expand Down Expand Up @@ -121,7 +123,7 @@ void GitIndex::OpenWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -163,6 +165,8 @@ void GitIndex::OpenAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
*/
Handle<Value> GitIndex::Read(const Arguments& args) {
Expand Down Expand Up @@ -192,7 +196,7 @@ void GitIndex::ReadWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -227,6 +231,8 @@ void GitIndex::ReadAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
*/
Handle<Value> GitIndex::Write(const Arguments& args) {
Expand Down Expand Up @@ -256,7 +262,7 @@ void GitIndex::WriteWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -291,6 +297,8 @@ void GitIndex::WriteAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
* @param {Tree} tree
*/
Expand Down Expand Up @@ -329,7 +337,7 @@ void GitIndex::ReadTreeWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -365,6 +373,8 @@ void GitIndex::ReadTreeAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
* @param {Oid} callback
*/
Expand Down Expand Up @@ -397,7 +407,7 @@ void GitIndex::WriteTreeWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -570,6 +580,8 @@ Handle<Value> GitIndex::RemoveDirectory(const Arguments& args) {
return Undefined();
}

#include "../include/functions/copy.h"

/**
* @param {String} path
*/
Expand Down Expand Up @@ -609,7 +621,7 @@ void GitIndex::AddBypathWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -760,6 +772,8 @@ Handle<Value> GitIndex::HasConflicts(const Arguments& args) {
return scope.Close(to);
}

#include "../include/functions/copy.h"

/**
* @param {Repository} repo
* @param {Index} index
Expand Down Expand Up @@ -815,7 +829,7 @@ void GitIndex::IndexToWorkdirWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/object.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ Handle<Value> GitObject::Type(const Arguments& args) {
return scope.Close(to);
}

#include "../include/functions/copy.h"

/**
* @param {Number} target_type
* @param {Object} callback
Expand Down Expand Up @@ -144,7 +146,7 @@ void GitObject::PeelWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/odb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ Handle<Value> GitOdb::AddDiskAlternate(const Arguments& args) {
return Undefined();
}

#include "../include/functions/copy.h"

/**
* @param {Oid} id
* @param {OdbObject} callback
Expand Down Expand Up @@ -208,7 +210,7 @@ void GitOdb::ReadWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -393,6 +395,8 @@ Handle<Value> GitOdb::Refresh(const Arguments& args) {
return Undefined();
}

#include "../include/functions/copy.h"

/**
* @param {String} data
* @param {Number} len
Expand Down Expand Up @@ -453,7 +457,7 @@ void GitOdb::WriteWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down
16 changes: 12 additions & 4 deletions src/reference.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ git_reference *GitReference::GetValue() {
}


#include "../include/functions/copy.h"

/**
* @param {Repository} repo
* @param {String} name
Expand Down Expand Up @@ -125,7 +127,7 @@ void GitReference::OidForNameWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -240,6 +242,8 @@ Handle<Value> GitReference::Name(const Arguments& args) {
return scope.Close(to);
}

#include "../include/functions/copy.h"

/**
* @param {Reference} callback
*/
Expand Down Expand Up @@ -271,7 +275,7 @@ void GitReference::ResolveWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -386,6 +390,8 @@ Handle<Value> GitReference::setTarget(const Arguments& args) {
return scope.Close(to);
}

#include "../include/functions/copy.h"

/**
* @param {String} new_name
* @param {Number} force
Expand Down Expand Up @@ -436,7 +442,7 @@ void GitReference::RenameWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -480,6 +486,8 @@ void GitReference::RenameAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
*/
Handle<Value> GitReference::Delete(const Arguments& args) {
Expand Down Expand Up @@ -509,7 +517,7 @@ void GitReference::DeleteWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down
10 changes: 8 additions & 2 deletions src/remote.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ Handle<Value> GitRemote::SetPushUrl(const Arguments& args) {
return Undefined();
}

#include "../include/functions/copy.h"

/**
* @param {Number} direction
*/
Expand Down Expand Up @@ -222,7 +224,7 @@ void GitRemote::ConnectWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -258,6 +260,8 @@ void GitRemote::ConnectAfterWork(uv_work_t *req) {
delete baton;
}

#include "../include/functions/copy.h"

/**
* @param {Function} progress_cb
* @param {void} payload
Expand Down Expand Up @@ -300,7 +304,7 @@ void GitRemote::DownloadWork(uv_work_t *req) {
);
baton->error_code = result;
if (result != GIT_OK) {
baton->error = giterr_last();
baton->error = git_error_dup(giterr_last());
}
}

Expand Down Expand Up @@ -370,6 +374,8 @@ Handle<Value> GitRemote::Stop(const Arguments& args) {
return Undefined();
}

#include "../include/functions/copy.h"

/**
*/
Handle<Value> GitRemote::Disconnect(const Arguments& args) {
Expand Down
Loading