Commit 6012e868 by Ben Straub

Merge pull request #972 from PaulThompson/separate_strarray

Separated git_strarray from common.h.  Added doxy comments.
parents 5300cd75 b46708aa
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "common.h" #include "common.h"
#include "types.h" #include "types.h"
#include "indexer.h" #include "indexer.h"
#include "strarray.h"
/** /**
* @file git2/checkout.h * @file git2/checkout.h
......
...@@ -85,14 +85,6 @@ GIT_BEGIN_DECL ...@@ -85,14 +85,6 @@ GIT_BEGIN_DECL
*/ */
#define GIT_PATH_MAX 4096 #define GIT_PATH_MAX 4096
typedef struct {
char **strings;
size_t count;
} git_strarray;
GIT_EXTERN(void) git_strarray_free(git_strarray *array);
GIT_EXTERN(int) git_strarray_copy(git_strarray *tgt, const git_strarray *src);
/** /**
* Return the version of the libgit2 library * Return the version of the libgit2 library
* being currently used. * being currently used.
...@@ -128,4 +120,5 @@ GIT_EXTERN(int) git_libgit2_capabilities(void); ...@@ -128,4 +120,5 @@ GIT_EXTERN(int) git_libgit2_capabilities(void);
/** @} */ /** @} */
GIT_END_DECL GIT_END_DECL
#endif #endif
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "common.h" #include "common.h"
#include "types.h" #include "types.h"
#include "oid.h" #include "oid.h"
#include "strarray.h"
/** /**
* @file git2/refs.h * @file git2/refs.h
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "refspec.h" #include "refspec.h"
#include "net.h" #include "net.h"
#include "indexer.h" #include "indexer.h"
#include "strarray.h"
/** /**
* @file git2/remote.h * @file git2/remote.h
......
/*
* Copyright (C) 2009-2012 the libgit2 contributors
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#ifndef INCLUDE_git_strarray_h__
#define INCLUDE_git_strarray_h__
#include "common.h"
/**
* @file git2/strarray.h
* @brief Git string array routines
* @defgroup git_strarray Git string array routines
* @ingroup Git
* @{
*/
GIT_BEGIN_DECL
/** Array of strings */
typedef struct _git_strarray git_strarray;
struct _git_strarray {
char **strings;
size_t count;
};
/**
* Close a string array object
*
* This method must always be called once a git_strarray is no
* longer needed, otherwise memory will leak.
*
* @param array array to close
*/
GIT_EXTERN(void) git_strarray_free(git_strarray *array);
/**
* Copy a string array object from source to target.
*
* Note: target is overwritten and hence should be empty,
* otherwise its contents are leaked.
*
* @param tgt target
* @param src source
*/
GIT_EXTERN(int) git_strarray_copy(git_strarray *tgt, const git_strarray *src);
/** @} */
GIT_END_DECL
#endif
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "types.h" #include "types.h"
#include "oid.h" #include "oid.h"
#include "object.h" #include "object.h"
#include "strarray.h"
/** /**
* @file git2/tag.h * @file git2/tag.h
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define INCLUDE_buffer_h__ #define INCLUDE_buffer_h__
#include "common.h" #include "common.h"
#include "git2/strarray.h"
#include <stdarg.h> #include <stdarg.h>
typedef struct { typedef struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment