{"thread":{"id":"212","subject":"[PATCH 04/19] Migrate update-cache.c to use the new cache api's","startedAt":"2005-04-21T18:35:28Z","lastAt":"2005-04-21T18:35:28Z","messageCount":1,"participants":["Brad Roberts"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"1161","messageId":"200504211835.j3LIZSIP027449@gameboy2.puremagic.com","threadId":"212","inReplyTo":null,"subject":"[PATCH 04/19] Migrate update-cache.c to use the new cache api's","fromName":"Brad Roberts","fromEmail":"braddr@gameboy2.puremagic.com","sentAt":"2005-04-21T18:35:28Z","receivedAt":"2005-04-21T18:35:28Z","isPatch":true,"sender":{"key":"braddr@gameboy2.puremagic.com","avatar":null},"body":"tree 34f7fc89e28a40387e811057065592ed2f0218a2\nparent d70686e08f453199e5451b27fc7d0b36b73a5c7f\nauthor Brad Roberts <braddr@puremagic.com> 1114073784 -0700\ncommitter Brad Roberts <braddr@gameboy2.puremagic.com> 1114073784 -0700\n\n[PATCH] Migrate update-cache.c to use the new cache api's\n\nSigned-off-by: Brad Roberts <braddr@puremagic.com>\n---\n\n read-cache.c   |    3 +++\n update-cache.c |   13 +++++--------\n 2 files changed, 8 insertions(+), 8 deletions(-)\n\nIndex: read-cache.c\n===================================================================\n--- d70686e08f453199e5451b27fc7d0b36b73a5c7f:1/read-cache.c  (mode:100644 sha1:6689df59d5a93e0503d7c80c114efbd16de826f3)\n+++ 40bf732f5bcb986943070a2ed6c09a16543d81be:1/read-cache.c  (mode:100644 sha1:8eaa05957a481b09116c37e43e16c5ef4e219a1e)\n@@ -122,6 +122,9 @@\n \n void set_cache_entry(struct cache_entry *ce, int pos)\n {\n+\t/* You can NOT just free active_cache[i] here, since it\n+\t * might not be necessarily malloc()ed but can also come\n+\t * from mmap(). */\n \tactive_cache[pos] = ce;\n }\n \nIndex: update-cache.c\n===================================================================\n--- d70686e08f453199e5451b27fc7d0b36b73a5c7f:1/update-cache.c  (mode:100644 sha1:585951108c57a64bb774114d289d81fd7fd22768)\n+++ 40bf732f5bcb986943070a2ed6c09a16543d81be:1/update-cache.c  (mode:100644 sha1:e741f593eb9c56c596fabed7eb6b79dee2d8cba9)\n@@ -204,13 +204,13 @@\n {\n \tint i;\n \n-\tfor (i = 0; i < active_nr; i++) {\n+\tfor (i = 0; i < get_num_cache_entries(); i++) {\n \t\tstruct cache_entry *ce, *new;\n-\t\tce = active_cache[i];\n+\t\tce = get_cache_entry(i);\n \t\tif (ce_stage(ce)) {\n \t\t\tprintf(\"%s: needs merge\\n\", ce->name);\n-\t\t\twhile ((i < active_nr) &&\n-\t\t\t       ! strcmp(active_cache[i]->name, ce->name))\n+\t\t\twhile ((i < get_num_cache_entries()) &&\n+\t\t\t       ! strcmp(get_cache_entry(i)->name, ce->name))\n \t\t\t\ti++;\n \t\t\ti--;\n \t\t\tcontinue;\n@@ -221,10 +221,7 @@\n \t\t\tprintf(\"%s: needs update\\n\", ce->name);\n \t\t\tcontinue;\n \t\t}\n-\t\t/* You can NOT just free active_cache[i] here, since it\n-\t\t * might not be necessarily malloc()ed but can also come\n-\t\t * from mmap(). */\n-\t\tactive_cache[i] = new;\n+\t\tset_cache_entry(new, i);\n \t}\n }\n \n\n"}]}