{"thread":{"id":"225","subject":"[PATCH 18/19] rename cache_match_stat to ce_match_stat to match other cache_entry related functions/macros","startedAt":"2005-04-21T18:39:06Z","lastAt":"2005-04-21T18:39:06Z","messageCount":1,"participants":["Brad Roberts"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"1174","messageId":"200504211839.j3LId6eV027844@gameboy2.puremagic.com","threadId":"225","inReplyTo":null,"subject":"[PATCH 18/19] rename cache_match_stat to ce_match_stat to match other cache_entry related functions/macros","fromName":"Brad Roberts","fromEmail":"braddr@gameboy2.puremagic.com","sentAt":"2005-04-21T18:39:06Z","receivedAt":"2005-04-21T18:39:06Z","isPatch":true,"sender":{"key":"braddr@gameboy2.puremagic.com","avatar":null},"body":"tree f8dd454f774d42526149193970b612a46f3ddd26\nparent 058c25fd81e5949354d96f2aad222ae73a6c1dee\nauthor Brad Roberts <braddr@puremagic.com> 1114088345 -0700\ncommitter Brad Roberts <braddr@gameboy2.puremagic.com> 1114088345 -0700\n\n[PATCH] rename cache_match_stat to ce_match_stat to match other cache_entry related functions/macros\n\nSigned-off-by: Brad Roberts <braddr@puremagic.com>\n---\n\n cache.h          |    3 ++-\n check-files.c    |    2 +-\n checkout-cache.c |    2 +-\n diff-cache.c     |    2 +-\n read-cache.c     |    2 +-\n show-diff.c      |    2 +-\n update-cache.c   |    2 +-\n 7 files changed, 8 insertions(+), 7 deletions(-)\n\nIndex: cache.h\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/cache.h  (mode:100644 sha1:a3018f9e12bfdd1a5273b20fcab5062667c6caec)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/cache.h  (mode:100644 sha1:c64969602d80a0e9d7137b2716fb808c912b075c)\n@@ -52,6 +52,8 @@\n #define CE_STAGEMASK (0x3000)\n #define CE_STAGESHIFT 12\n \n+extern int ce_match_stat(struct cache_entry *ce, struct stat *st);\n+\n #define create_ce_flags(len, stage) htons((len) | ((stage) << CE_STAGESHIFT))\n #define ce_namelen(ce) (CE_NAMEMASK & ntohs((ce)->ce_flags))\n #define ce_size(ce) cache_entry_size(ce_namelen(ce))\n@@ -76,7 +78,6 @@\n extern int cache_name_pos(const char *name, int namelen);\n extern int add_cache_entry(struct cache_entry *ce, int ok_to_add);\n extern int remove_file_from_cache(char *path);\n-extern int cache_match_stat(struct cache_entry *ce, struct stat *st);\n extern int get_num_cache_entries();\n extern struct cache_entry * get_cache_entry(int pos);\n extern void set_cache_entry(struct cache_entry *ce, int pos);\nIndex: check-files.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/check-files.c  (mode:100644 sha1:919e418b5f0f85220445c876a37bf4cf61d26525)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/check-files.c  (mode:100644 sha1:0973e81fbbc0f9f98031fb249254bd89d8088889)\n@@ -31,7 +31,7 @@\n \tif (fstat(fd, &st) < 0)\n \t\tdie(\"fstat(%s): %s\", path, strerror(errno));\n \n-\tchanged = cache_match_stat(ce, &st);\n+\tchanged = ce_match_stat(ce, &st);\n \tif (changed)\n \t\tdie(\"preparing to update file '%s' not uptodate in cache\", path);\n }\nIndex: checkout-cache.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/checkout-cache.c  (mode:100644 sha1:bf9cd0572c883219d37f2788ec5f5553a136df2b)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/checkout-cache.c  (mode:100644 sha1:27b559d5bcc5831eda441bcd1fd88d687f2567b8)\n@@ -100,7 +100,7 @@\n \tstruct stat st;\n \n \tif (!stat(ce->name, &st)) {\n-\t\tunsigned changed = cache_match_stat(ce, &st);\n+\t\tunsigned changed = ce_match_stat(ce, &st);\n \t\tif (!changed)\n \t\t\treturn 0;\n \t\tif (!force) {\nIndex: diff-cache.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/diff-cache.c  (mode:100644 sha1:548211944fc00594bfc06b9ab90f0cb476688285)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/diff-cache.c  (mode:100644 sha1:5ae6d5de5ed5ad34f72267904ff8eb6288855fc5)\n@@ -125,7 +125,7 @@\n \t\t\tshow_file(\"-\", path1, mode1, sha1, base);\n \t\t\treturn -1;\n \t\t}\n-\t\tchanged = cache_match_stat(ce, &st);\n+\t\tchanged = ce_match_stat(ce, &st);\n \t\tclose(fd);\n \t\tif (changed) {\n \t\t\tmode2 = st.st_mode;\nIndex: read-cache.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/read-cache.c  (mode:100644 sha1:31e293a3686622c9ec180d41aa37d85ce49325e8)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/read-cache.c  (mode:100644 sha1:8837d27ab683bf07d38aee33c62a90f5a7221588)\n@@ -44,7 +44,7 @@\n \tcache = NULL;\n }\n \n-int cache_match_stat(struct cache_entry *ce, struct stat *st)\n+int ce_match_stat(struct cache_entry *ce, struct stat *st)\n {\n \tunsigned int changed = 0;\n \nIndex: show-diff.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/show-diff.c  (mode:100644 sha1:6e04e9182667cbb79afa4c878a31b685fdea3229)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/show-diff.c  (mode:100644 sha1:4a0902f50b3120b7791a4d4627a9a4f729afdcf7)\n@@ -193,7 +193,7 @@\n \t\t\t}\n \t\t\tcontinue;\n \t\t}\n-\t\tchanged = cache_match_stat(ce, &st);\n+\t\tchanged = ce_match_stat(ce, &st);\n \t\tif (!changed)\n \t\t\tcontinue;\n \t\tif (!machine_readable)\nIndex: update-cache.c\n===================================================================\n--- 058c25fd81e5949354d96f2aad222ae73a6c1dee:1/update-cache.c  (mode:100644 sha1:8328975cb726f5e06a413a9f0099bfa2f81d3381)\n+++ 0a556dc01b8e48f684ce6e0c26f8c00b5e39c4ac:1/update-cache.c  (mode:100644 sha1:3f251552283667c42797835088a4922ef865fe4a)\n@@ -179,7 +179,7 @@\n \tif (stat(ce->name, &st) < 0)\n \t\treturn NULL;\n \n-\tchanged = cache_match_stat(ce, &st);\n+\tchanged = ce_match_stat(ce, &st);\n \tif (!changed)\n \t\treturn ce;\n \n\n"}]}