From: Lukas Fleischer <git@cryptocrack.de>
To: git@vger.kernel.org
Subject: [PATCH 2/3] Add size parameter to read_index_data()
Date: Fri, 12 Apr 2013 19:26:12 +0200 [thread overview]
Message-ID: <1365787573-597-3-git-send-email-git@cryptocrack.de> (raw)
In-Reply-To: <1365787573-597-1-git-send-email-git@cryptocrack.de>
This allows for optionally getting the size of the returned data and
will be used in a follow-up patch.
Signed-off-by: Lukas Fleischer <git@cryptocrack.de>
---
attr.c | 2 +-
cache.h | 2 +-
read-cache.c | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/attr.c b/attr.c
index 2e1ce7b..e5af3c6 100644
--- a/attr.c
+++ b/attr.c
@@ -387,7 +387,7 @@ static struct attr_stack *read_attr_from_index(const char *path, int macro_ok)
char *buf, *sp;
int lineno = 0;
- buf = read_index_data(path, use_index);
+ buf = read_index_data(path, use_index, NULL);
if (!buf)
return NULL;
diff --git a/cache.h b/cache.h
index a71e443..b281bbf 100644
--- a/cache.h
+++ b/cache.h
@@ -471,7 +471,7 @@ extern int add_file_to_index(struct index_state *, const char *path, int flags);
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
extern int index_name_is_other(const struct index_state *, const char *, int);
-extern void *read_index_data(const char *path, struct index_state *use_index);
+extern void *read_index_data(const char *path, struct index_state *use_index, unsigned long *size);
/* do stat comparison even if CE_VALID is true */
#define CE_MATCH_IGNORE_VALID 01
diff --git a/read-cache.c b/read-cache.c
index 39e3424..32dc471 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1900,7 +1900,8 @@ int index_name_is_other(const struct index_state *istate, const char *name,
return 1;
}
-void *read_index_data(const char *path, struct index_state *use_index)
+void *read_index_data(const char *path, struct index_state *use_index,
+ unsigned long *size)
{
int pos, len;
unsigned long sz;
@@ -1930,5 +1931,7 @@ void *read_index_data(const char *path, struct index_state *use_index)
free(data);
return NULL;
}
+ if (size)
+ *size = sz;
return data;
}
--
1.8.2.675.gda3bb24.dirty
next prev parent reply other threads:[~2013-04-12 17:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 17:26 [PATCH 0/3] Remove ~25 lines of duplicate code Lukas Fleischer
2013-04-12 17:26 ` [PATCH 1/3] Make read_index_data() public Lukas Fleischer
2013-04-12 19:40 ` Jeff King
2013-04-13 8:23 ` Lukas Fleischer
2013-04-12 17:26 ` Lukas Fleischer [this message]
2013-04-12 17:26 ` [PATCH 3/3] convert.c: Remove duplicate code Lukas Fleischer
2013-04-13 13:28 ` [PATCH v2 1/3] Add public function read_blob_data_from_index_path() Lukas Fleischer
2013-04-13 13:28 ` [PATCH v2 2/3] Add size parameter to read_blob_data_from_index_path() Lukas Fleischer
2013-04-13 13:28 ` [PATCH v2 3/3] convert.c: Remove duplicate code Lukas Fleischer
2013-04-14 5:49 ` [PATCH v2 1/3] Add public function read_blob_data_from_index_path() Junio C Hamano
2013-04-14 6:55 ` Junio C Hamano
2013-04-14 20:14 ` Lukas Fleischer
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=1365787573-597-3-git-send-email-git@cryptocrack.de \
--to=git@cryptocrack.de \
--cc=git@vger.kernel.org \
/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).