[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26990] trunk/blender/source/blender: remove duplicate function.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 17 15:09:17 CET 2010
Revision: 26990
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26990
Author: campbellbarton
Date: 2010-02-17 15:09:16 +0100 (Wed, 17 Feb 2010)
Log Message:
-----------
remove duplicate function.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/imbuf/intern/anim.c
Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h 2010-02-17 13:43:50 UTC (rev 26989)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h 2010-02-17 14:09:16 UTC (rev 26990)
@@ -63,8 +63,8 @@
int BLI_testextensie(const char *str, const char *ext);
void BLI_uniquename(struct ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short len);
void BLI_newname(char * name, int add);
-int BLI_stringdec(char *string, char *kop, char *start, unsigned short *numlen);
-void BLI_stringenc(char *string, char *kop, char *start, unsigned short numlen, int pic);
+int BLI_stringdec(char *string, char *head, char *start, unsigned short *numlen);
+void BLI_stringenc(char *string, char *head, char *start, unsigned short numlen, int pic);
void BLI_splitdirstring(char *di,char *fi);
/* make sure path separators conform to system one */
Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c 2010-02-17 13:43:50 UTC (rev 26989)
+++ trunk/blender/source/blender/imbuf/intern/anim.c 2010-02-17 14:09:16 UTC (rev 26990)
@@ -255,22 +255,10 @@
}
-static void an_stringenc(char *string, char *kop, char *staart,
-unsigned short numlen, int pic) {
- char numstr[10];
- unsigned short len,i;
-
- len=sprintf(numstr,"%d",pic);
-
- strcpy(string,kop);
- for(i=len;i<numlen;i++){
- strcat(string,"0");
- }
- strcat(string,numstr);
- strcat(string,staart);
+static void an_stringenc(char *string, char *head, char *start, unsigned short numlen, int pic) {
+ BLI_stringenc(string, head, start, numlen, pic);
}
-
static void free_anim_avi (struct anim *anim) {
#if defined(_WIN32) && !defined(FREE_WINDOWS)
int i;
More information about the Bf-blender-cvs
mailing list