RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 09-Mar-2012 02:21:45
Branch: rpm-5_4 Handle: 2012030901214500
Modified files: (Branch: rpm-5_4)
rpm/rpmio librpmio.vers rpmgit.c rpmgit.h
Log:
- rpmgit: haul out a load of trash.
Summary:
Revision Changes Path
2.199.2.5 +1 -1 rpm/rpmio/librpmio.vers
2.1.2.7 +5 -3 rpm/rpmio/rpmgit.c
2.1.2.6 +16 -10 rpm/rpmio/rpmgit.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.4 -r2.199.2.5 librpmio.vers
--- rpm/rpmio/librpmio.vers 7 Mar 2012 23:52:48 -0000 2.199.2.4
+++ rpm/rpmio/librpmio.vers 9 Mar 2012 01:21:45 -0000 2.199.2.5
@@ -363,7 +363,7 @@
rpmGetMacroEntries;
rpmGetPath;
_rpmgit_debug;
- rpmgitConfig;
+ rpmgitConfigPrint;
rpmgitInfo;
rpmgitNew;
rpmgitRead;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.c
============================================================================
$ cvs diff -u -r2.1.2.6 -r2.1.2.7 rpmgit.c
--- rpm/rpmio/rpmgit.c 8 Mar 2012 22:18:26 -0000 2.1.2.6
+++ rpm/rpmio/rpmgit.c 9 Mar 2012 01:21:45 -0000 2.1.2.7
@@ -142,7 +142,7 @@
/*==============================================================*/
-static int rpmgitConfigPrint(const char * var_name, const char * value,
+static int rpmgitConfigCB(const char * var_name, const char * value,
void * _git)
{
rpmgit git = (rpmgit) _git;
@@ -154,7 +154,7 @@
return rc;
}
-int rpmgitConfig(rpmgit git)
+int rpmgitConfigPrint(rpmgit git)
{
int rc = -1;
#if defined(WITH_LIBGIT2)
@@ -163,7 +163,7 @@
git_repository_config((git_config **)&git->cfg, git->R));
rc = chkgit(git, "git_config_foreach",
- git_config_foreach(git->cfg, rpmgitConfigPrint, git));
+ git_config_foreach(git->cfg, rpmgitConfigCB, git));
#endif
SPEW(0, rc, git);
return rc;
@@ -368,6 +368,8 @@
git->I = NULL;
git->R = NULL;
+ git->user_email = _free(git->user_email);
+ git->user_name = _free(git->user_name);
git->fn = _free(git->fn);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.h
============================================================================
$ cvs diff -u -r2.1.2.5 -r2.1.2.6 rpmgit.h
--- rpm/rpmio/rpmgit.h 8 Mar 2012 22:18:26 -0000 2.1.2.5
+++ rpm/rpmio/rpmgit.h 9 Mar 2012 01:21:45 -0000 2.1.2.6
@@ -21,19 +21,25 @@
struct rpmgit_s {
struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
const char * fn;
+
+ int core_bare;
+ int core_repositoryformatversion;
+ const char * user_name;
+ const char * user_email;
+
int major;
int minor;
int rev;
- void * R; /* git_repository * */
- void * I; /* git_index * */
- void * T; /* git_tree * */
- void * C; /* git_commit * */
- void * H; /* git_reference * */
-
- void * cfg; /* git_config * */
- void * odb; /* git_odb * */
- void * walk; /* git_revwalk * */
+ void * R; /*!< git_repository * */
+ void * I; /*!< git_index * */
+ void * T; /*!< git_tree * */
+ void * C; /*!< git_commit * */
+ void * H; /*!< git_reference * */
+
+ void * cfg; /*!< git_config * */
+ void * odb; /*!< git_odb * */
+ void * walk; /*!< git_revwalk * */
#ifdef NOTYET
const void * Cauthor;
@@ -99,7 +105,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/;
-int rpmgitConfig(rpmgit git);
+int rpmgitConfigPrint(rpmgit git);
int rpmgitInfo(rpmgit git);
int rpmgitTree(rpmgit git);
int rpmgitWalk(rpmgit git);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
