From: Johan Herland <johan@herland.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, johan@herland.net
Subject: [PATCHv11 01/20] Minor non-functional fixes to notes.c
Date: Sun, 17 Jan 2010 22:04:18 +0100 [thread overview]
Message-ID: <1263762277-31419-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1263762277-31419-1-git-send-email-johan@herland.net>
Signed-off-by: Johan Herland <johan@herland.net>
---
notes.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/notes.c b/notes.c
index 023adce..47e38a1 100644
--- a/notes.c
+++ b/notes.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "commit.h"
#include "notes.h"
-#include "refs.h"
#include "utf8.h"
#include "strbuf.h"
#include "tree-walk.h"
@@ -93,7 +92,7 @@ static void **note_tree_search(struct int_node **tree,
i = GET_NIBBLE(*n, key_sha1);
p = (*tree)->a[i];
- switch(GET_PTR_TYPE(p)) {
+ switch (GET_PTR_TYPE(p)) {
case PTR_TYPE_INTERNAL:
*tree = CLR_PTR_TYPE(p);
(*n)++;
@@ -195,7 +194,7 @@ static void note_tree_insert(struct int_node *tree, unsigned char n,
assert(GET_PTR_TYPE(entry) == 0); /* no type bits set */
l = (struct leaf_node *) CLR_PTR_TYPE(*p);
- switch(GET_PTR_TYPE(*p)) {
+ switch (GET_PTR_TYPE(*p)) {
case PTR_TYPE_NULL:
assert(!*p);
*p = SET_PTR_TYPE(entry, type);
@@ -257,7 +256,7 @@ static void note_tree_free(struct int_node *tree)
unsigned int i;
for (i = 0; i < 16; i++) {
void *p = tree->a[i];
- switch(GET_PTR_TYPE(p)) {
+ switch (GET_PTR_TYPE(p)) {
case PTR_TYPE_INTERNAL:
note_tree_free(CLR_PTR_TYPE(p));
/* fall through */
@@ -274,7 +273,7 @@ static void note_tree_free(struct int_node *tree)
* - hex_len - Length of above segment. Must be multiple of 2 between 0 and 40
* - sha1 - Partial SHA1 value is written here
* - sha1_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20
- * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format).
+ * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format)).
* Otherwise, returns number of bytes written to sha1 (i.e. hex_len / 2).
* Pads sha1 with NULs up to sha1_len (not included in returned length).
*/
--
1.6.6.rc1.321.g0496e
next prev parent reply other threads:[~2010-01-17 21:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 21:04 [PATCHv11 00/20] git notes Johan Herland
2010-01-17 21:04 ` Johan Herland [this message]
2010-01-17 21:04 ` [PATCHv11 02/20] Notes API: get_commit_notes() -> format_note() + remove the commit restriction Johan Herland
2010-01-17 21:04 ` [PATCHv11 03/20] Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef Johan Herland
2010-01-17 21:04 ` [PATCHv11 04/20] Notes API: init_notes(): Initialize the notes tree from the given notes ref Johan Herland
2010-01-17 21:04 ` [PATCHv11 05/20] Notes API: add_note(): Add note objects to the internal notes tree structure Johan Herland
2010-01-17 21:04 ` [PATCHv11 06/20] Notes API: remove_note(): Remove note objects from the " Johan Herland
2010-01-17 21:04 ` [PATCHv11 07/20] Notes API: get_note(): Return the note annotating the given object Johan Herland
2010-01-17 21:04 ` [PATCHv11 08/20] Notes API: for_each_note(): Traverse the entire notes tree with a callback Johan Herland
2010-01-17 21:04 ` [PATCHv11 09/20] Notes API: write_notes_tree(): Store the notes tree in the database Johan Herland
2010-01-17 21:04 ` [PATCHv11 10/20] Notes API: Allow multiple concurrent notes trees with new struct notes_tree Johan Herland
2010-01-17 21:04 ` [PATCHv11 11/20] Refactor notes concatenation into a flexible interface for combining notes Johan Herland
2010-01-17 21:04 ` [PATCHv11 12/20] Builtin-ify git-notes Johan Herland
2010-01-21 18:28 ` Stephen Boyd
2010-01-26 2:09 ` Johan Herland
2010-01-17 21:04 ` [PATCHv11 13/20] t3301: Verify successful annotation of non-commits Johan Herland
2010-01-17 21:04 ` [PATCHv11 14/20] t3305: Verify that adding many notes with git-notes triggers increased fanout Johan Herland
2010-01-17 21:04 ` [PATCHv11 15/20] Teach notes code to properly preserve non-notes in the notes tree Johan Herland
2010-01-17 21:04 ` [PATCHv11 16/20] Teach builtin-notes to remove empty notes Johan Herland
2010-01-17 21:04 ` [PATCHv11 17/20] builtin-notes: Teach -d option for deleting existing notes Johan Herland
2010-01-17 21:04 ` [PATCHv11 18/20] t3305: Verify that removing notes triggers automatic fanout consolidation Johan Herland
2010-01-17 21:04 ` [PATCHv11 19/20] Notes API: gc_notes(): Prune notes that belong to non-existing objects Johan Herland
2010-01-17 21:04 ` [PATCHv11 20/20] builtin-gc: Teach the new --notes option to garbage-collect notes Johan Herland
2010-01-21 19:27 ` Stephen Boyd
2010-01-21 20:01 ` Junio C Hamano
2010-01-27 12:02 ` Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263762277-31419-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).