[libgit2-glib/wip/development] Fix enums



commit 8034fc17f0c11cbea9f3d8c841d52667141aa77d
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Jun 5 08:56:17 2013 +0200

    Fix enums

 libgit2-glib/ggit-types.c |   20 ++++++++++----------
 libgit2-glib/ggit-types.h |   28 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/libgit2-glib/ggit-types.c b/libgit2-glib/ggit-types.c
index 096be29..a198f2e 100644
--- a/libgit2-glib/ggit-types.c
+++ b/libgit2-glib/ggit-types.c
@@ -77,14 +77,15 @@ ASSERT_ENUM (GGIT_DIFF_FLAG_BINARY,     GIT_DIFF_FLAG_BINARY);
 ASSERT_ENUM (GGIT_DIFF_FLAG_NOT_BINARY, GIT_DIFF_FLAG_NOT_BINARY);
 
 
-ASSERT_ENUM (GGIT_DIFF_LINE_CONTEXT,   GIT_DIFF_LINE_CONTEXT);
-ASSERT_ENUM (GGIT_DIFF_LINE_ADDITION,  GIT_DIFF_LINE_ADDITION);
-ASSERT_ENUM (GGIT_DIFF_LINE_DELETION,  GIT_DIFF_LINE_DELETION);
-ASSERT_ENUM (GGIT_DIFF_LINE_ADD_EOFNL, GIT_DIFF_LINE_ADD_EOFNL);
-ASSERT_ENUM (GGIT_DIFF_LINE_DEL_EOFNL, GIT_DIFF_LINE_DEL_EOFNL);
-ASSERT_ENUM (GGIT_DIFF_LINE_FILE_HDR,  GIT_DIFF_LINE_FILE_HDR);
-ASSERT_ENUM (GGIT_DIFF_LINE_HUNK_HDR,  GIT_DIFF_LINE_HUNK_HDR);
-ASSERT_ENUM (GGIT_DIFF_LINE_BINARY,    GIT_DIFF_LINE_BINARY);
+ASSERT_ENUM (GGIT_DIFF_LINE_CONTEXT,       GIT_DIFF_LINE_CONTEXT);
+ASSERT_ENUM (GGIT_DIFF_LINE_ADDITION,      GIT_DIFF_LINE_ADDITION);
+ASSERT_ENUM (GGIT_DIFF_LINE_DELETION,      GIT_DIFF_LINE_DELETION);
+ASSERT_ENUM (GGIT_DIFF_LINE_CONTEXT_EOFNL, GIT_DIFF_LINE_CONTEXT_EOFNL);
+ASSERT_ENUM (GGIT_DIFF_LINE_ADD_EOFNL,     GIT_DIFF_LINE_ADD_EOFNL);
+ASSERT_ENUM (GGIT_DIFF_LINE_DEL_EOFNL,     GIT_DIFF_LINE_DEL_EOFNL);
+ASSERT_ENUM (GGIT_DIFF_LINE_FILE_HDR,      GIT_DIFF_LINE_FILE_HDR);
+ASSERT_ENUM (GGIT_DIFF_LINE_HUNK_HDR,      GIT_DIFF_LINE_HUNK_HDR);
+ASSERT_ENUM (GGIT_DIFF_LINE_BINARY,        GIT_DIFF_LINE_BINARY);
 
 
 ASSERT_ENUM (GGIT_ERROR_GIT_ERROR,   GIT_ERROR);
@@ -102,9 +103,8 @@ ASSERT_ENUM (GGIT_FILEMODE_BLOB_EXECUTABLE, GIT_FILEMODE_BLOB_EXECUTABLE);
 ASSERT_ENUM (GGIT_FILEMODE_LINK, GIT_FILEMODE_LINK);
 ASSERT_ENUM (GGIT_FILEMODE_COMMIT, GIT_FILEMODE_COMMIT);
 
-ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_UNSET, GIT_REMOTE_DOWNLOAD_TAGS_UNSET);
-ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_NONE,  GIT_REMOTE_DOWNLOAD_TAGS_NONE);
 ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_AUTO,  GIT_REMOTE_DOWNLOAD_TAGS_AUTO);
+ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_NONE,  GIT_REMOTE_DOWNLOAD_TAGS_NONE);
 ASSERT_ENUM (GGIT_REMOTE_DOWNLOAD_TAGS_ALL,   GIT_REMOTE_DOWNLOAD_TAGS_ALL);
 
 ASSERT_ENUM (GGIT_REF_INVALID,  GIT_REF_INVALID);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index a015214..8106286 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -421,6 +421,7 @@ typedef enum {
  * @GGIT_DIFF_LINE_CONTEXT: line is part of the context.
  * @GGIT_DIFF_LINE_ADDITION: line that was added.
  * @GGIT_DIFF_LINE_DELETION: line that was removed.
+ * @GGIT_DIFF_LINE_CONTEXT_EOFNL: Both files have no LF at end.
  * @GGIT_DIFF_LINE_ADD_EOFNL: LF was added at end of file.
  * @GGIT_DIFF_LINE_DEL_EOFNL: LF was removed at end of file.
  * @GGIT_DIFF_LINE_FILE_HDR: the file header.
@@ -434,14 +435,15 @@ typedef enum {
  * #GGIT_DIFF_LINE_BINARY values are only sent when the diff is being printed.
  */
 typedef enum {
-       GGIT_DIFF_LINE_CONTEXT   = ' ',
-       GGIT_DIFF_LINE_ADDITION  = '+',
-       GGIT_DIFF_LINE_DELETION  = '-',
-       GGIT_DIFF_LINE_ADD_EOFNL = '\n',
-       GGIT_DIFF_LINE_DEL_EOFNL = '\0',
-       GGIT_DIFF_LINE_FILE_HDR  = 'F',
-       GGIT_DIFF_LINE_HUNK_HDR  = 'H',
-       GGIT_DIFF_LINE_BINARY    = 'B'
+       GGIT_DIFF_LINE_CONTEXT       = ' ',
+       GGIT_DIFF_LINE_ADDITION      = '+',
+       GGIT_DIFF_LINE_DELETION      = '-',
+       GGIT_DIFF_LINE_CONTEXT_EOFNL = '=',
+       GGIT_DIFF_LINE_ADD_EOFNL     = '>',
+       GGIT_DIFF_LINE_DEL_EOFNL     = '<',
+       GGIT_DIFF_LINE_FILE_HDR      = 'F',
+       GGIT_DIFF_LINE_HUNK_HDR      = 'H',
+       GGIT_DIFF_LINE_BINARY        = 'B'
 } GgitDiffLineType;
 
 /* NOTE: keep in sync with git2/errors.h */
@@ -480,16 +482,14 @@ typedef enum {
 /* NOTE: keep in sync with git2/refs.h */
 /**
  * GgitRemoteDownloadTagsType:
- * @GGIT_REMOTE_DOWNLOAD_TAGS_UNSET:
- * @GGIT_REMOTE_DOWNLOAD_TAGS_NONE:
  * @GGIT_REMOTE_DOWNLOAD_TAGS_AUTO:
+ * @GGIT_REMOTE_DOWNLOAD_TAGS_NONE:
  * @GGIT_REMOTE_DOWNLOAD_TAGS_ALL:
  */
 typedef enum {
-       GGIT_REMOTE_DOWNLOAD_TAGS_UNSET,
-       GGIT_REMOTE_DOWNLOAD_TAGS_NONE,
-       GGIT_REMOTE_DOWNLOAD_TAGS_AUTO,
-       GGIT_REMOTE_DOWNLOAD_TAGS_ALL
+       GGIT_REMOTE_DOWNLOAD_TAGS_AUTO = 0,
+       GGIT_REMOTE_DOWNLOAD_TAGS_NONE = 1,
+       GGIT_REMOTE_DOWNLOAD_TAGS_ALL  = 2
 } GgitRemoteDownloadTagsType;
 
 /* NOTE: keep in sync with git2/refs.h */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]