Shave off a strlen() call in ftp_mkdir()

Bellardia · Nov 20, 2016 · 06767ff · 06767ff
1 parent d7deaac
commit 06767ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -560,7 +560,7 @@ ftp_cdup(ftpbuf_t *ftp)
 /* {{{ ftp_mkdir
  */
 zend_string*
-ftp_mkdir(ftpbuf_t *ftp, const char *dir)
+ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len)
 {
 	char *mkd, *end;
 	zend_string *ret;
@@ -576,7 +576,7 @@ ftp_mkdir(ftpbuf_t *ftp, const char *dir)
 	}
 	/* copy out the dir from response */
 	if ((mkd = strchr(ftp->inbuf, '"')) == NULL) {
-		return zend_string_init(dir, strlen(dir), 0);
+		return zend_string_init(dir, dir_len, 0);
 	}
 	if ((end = strrchr(++mkd, '"')) == NULL) {
 		return NULL;

diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
@@ -135,7 +135,7 @@ int		ftp_cdup(ftpbuf_t *ftp);
 /* creates a directory, return the directory name on success, NULL on error.
  * the return value must be freed
  */
-zend_string* ftp_mkdir(ftpbuf_t *ftp, const char *dir);
+zend_string* ftp_mkdir(ftpbuf_t *ftp, const char *dir, const size_t dir_len);
 
 /* removes a directory, return true on success, false on error */
 int		ftp_rmdir(ftpbuf_t *ftp, const char *dir);

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
@@ -593,7 +593,7 @@ PHP_FUNCTION(ftp_mkdir)
 	}
 
 	/* create directorie */
-	if (NULL == (tmp = ftp_mkdir(ftp, dir))) {
+	if (NULL == (tmp = ftp_mkdir(ftp, dir, dir_len))) {
 		php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf);
 		RETURN_FALSE;
 	}