git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 08/18] do_for_each_reflog(): use a strbuf to hold logfile name

From
Junio C Hamano <junio@pobox.com>
Date
Apr 26, 2012, 23:25 UTC
Message-ID
<xmqqaa1y6poq.fsf@junio.mtv.corp.google.com>
In-Reply-To
<1335479227-7877-9-git-send-email-mhagger@alum.mit.edu>
mhagger@alum.mit.edu writes:
Show 56 quoted lines
> From: Michael Haggerty <mhagger@alum.mit.edu>
>
> This simplifies the bookkeeping and allows an (artificial) restriction
> on refname component length to be removed.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
>  refs.c |   45 +++++++++++++++++++++++----------------------
>  1 file changed, 23 insertions(+), 22 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 1d25151..f43c255 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -2248,44 +2248,45 @@ static int do_for_each_reflog(const char *base, each_ref_fn fn, void *cb_data)
>  	int retval = 0;
>  	struct dirent *de;
>  	int baselen;
> -	char *log;
> +	struct strbuf log;
>  
>  	if (!d)
>  		return *base ? errno : 0;
>  
>  	baselen = strlen(base);
> -	log = xmalloc(baselen + 257);
> -	memcpy(log, base, baselen);
> -	if (baselen && base[baselen-1] != '/')
> -		log[baselen++] = '/';
> +	strbuf_init(&log, baselen + 257);
> +	strbuf_add(&log, base, baselen);
> +	if (log.len && log.buf[log.len-1] != '/') {
> +		strbuf_addch(&log, '/');
> +		baselen++;
> +	}
>  
>  	while ((de = readdir(d)) != NULL) {
>  		struct stat st;
> -		int namelen;
>  
>  		if (de->d_name[0] == '.')
>  			continue;
> -		namelen = strlen(de->d_name);
> -		if (namelen > 255)
> -			continue;
>  		if (has_extension(de->d_name, ".lock"))
>  			continue;
> -		memcpy(log + baselen, de->d_name, namelen+1);
> -		if (stat(git_path("logs/%s", log), &st) < 0)
> -			continue;
> -		if (S_ISDIR(st.st_mode)) {
> -			retval = do_for_each_reflog(log, fn, cb_data);
> +		strbuf_addstr(&log, de->d_name);
> +		if (stat(git_path("logs/%s", log.buf), &st) < 0) {
> +			/* Silently ignore. */
>  		} else {
Please write this like this:
		if (...) {
			; /* silently ignore */
		}

to make the "emptyness" stand out (I amended the previous round when I queued them to 'pu', but I forgot to point it out in my review message).

Previous: mhagger@alum.mit.eduNext: Michael Haggerty
Message 13 of 26 in “Read loose references lazily”
  1. 00/18 Read loose references lazilymhagger@alum.mit.edu, Apr 26, 2012
  2. 01/18 get_ref_dir(): return early if directory cannot be readmhagger@alum.mit.edu, Apr 26, 2012
  3. 02/18 get_ref_dir(): use a strbuf to hold refnamemhagger@alum.mit.edu, Apr 26, 2012
  4. 03/18 get_ref_dir(): rename "base" parameter to "dirname"mhagger@alum.mit.edu, Apr 26, 2012
  5. 04/18 get_ref_dir(): require that the dirname argument ends in '/'mhagger@alum.mit.edu, Apr 26, 2012
  6. 05/18 refs.c: extract function search_for_subdir()mhagger@alum.mit.edu, Apr 26, 2012
  7. Junio C HamanoMay 3, 2012
  8. Junio C HamanoMay 3, 2012
  9. Michael HaggertyMay 4, 2012
  10. 06/18 get_ref_dir(): take the containing directory as argumentmhagger@alum.mit.edu, Apr 26, 2012
  11. 07/18 do_for_each_reflog(): return early on errormhagger@alum.mit.edu, Apr 26, 2012
  12. 08/18 do_for_each_reflog(): use a strbuf to hold logfile namemhagger@alum.mit.edu, Apr 26, 2012
  13. Junio C HamanoApr 26, 2012
  14. Michael HaggertyApr 27, 2012
  15. Junio C HamanoMay 2, 2012
  16. Michael HaggertyMay 3, 2012
  17. 09/18 do_for_each_reflog(): reuse strbuf across recursive function callsmhagger@alum.mit.edu, Apr 26, 2012
  18. 10/18 bisect: copy filename string obtained from git_path()mhagger@alum.mit.edu, Apr 26, 2012
  19. 11/18 find_containing_dir(): use strbuf in implementation of this functionmhagger@alum.mit.edu, Apr 26, 2012
  20. 12/18 refs: wrap top-level ref_dirs in ref_entriesmhagger@alum.mit.edu, Apr 26, 2012
  21. 13/18 read_loose_refs(): rename function from get_ref_dir()mhagger@alum.mit.edu, Apr 26, 2012
  22. 14/18 get_ref_dir(): add function for getting a ref_dir from a ref_entrymhagger@alum.mit.edu, Apr 26, 2012
  23. 15/18 search_for_subdir(): return (ref_dir *) instead of (ref_entry *)mhagger@alum.mit.edu, Apr 26, 2012
  24. 16/18 struct ref_dir: store a reference to the enclosing ref_cachemhagger@alum.mit.edu, Apr 26, 2012
  25. 17/18 read_loose_refs(): eliminate ref_cache argumentmhagger@alum.mit.edu, Apr 26, 2012
  26. 18/18 refs: read loose references lazilymhagger@alum.mit.edu, Apr 26, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.