svn commit: r484795 - /incubator/mod_ftp/trunk/modules/ftp/ftp_util.c

[wr...@apache.org]

Author: wrowe
Date: Fri Dec  8 13:41:32 2006
New Revision: 484795

URL: http://svn.apache.org/viewvc?view=rev&rev=484795
Log:
Fix very early apr syntaxes

Modified:
    incubator/mod_ftp/trunk/modules/ftp/ftp_util.c

Modified: incubator/mod_ftp/trunk/modules/ftp/ftp_util.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/ftp/ftp_util.c?view=diff&rev=484795&r1=484794&r2=484795
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/ftp_util.c Fri Dec  8 13:41:32 2006
@@ -104,7 +104,7 @@
     const char *test, *sl;
     char mode[FTP_MODESTRING_LEN] = "----------";
 
-    for (test = name; sl = strchr(test, '/'); test = sl + 1)
+    for (test = name; (sl = ap_strchr_c(test, '/')); test = sl + 1)
         /* noop */ ;
 
     if (!strcmp("..", test)) {
@@ -155,19 +155,19 @@
             dirent->groupname = apr_psprintf(r->pool, "%d", rr->finfo.group);
         }
         else {
-            if ((apr_get_username(&dirent->username, rr->finfo.user, r->pool)
+            if ((apr_uid_name_get(&dirent->username, rr->finfo.user, r->pool)
                     != APR_SUCCESS) || (!dirent->username) 
                                     || (!dirent->username[0])) {
                 dirent->username = apr_psprintf(r->pool, "%d", rr->finfo.user);
             }
-            if ((apr_get_groupname(&dirent->groupname, rr->finfo.group, r->pool)
+            if ((apr_gid_name_get(&dirent->groupname, rr->finfo.group, r->pool)
                     != APR_SUCCESS) || (!dirent->groupname) 
                                     || (!dirent->groupname[0])) {
                 dirent->groupname = apr_psprintf(r->pool, "%d", rr->finfo.group);
             }
         }
 
-        apr_explode_localtime(&xt, rr->finfo.mtime);
+        apr_time_exp_lt(&xt, rr->finfo.mtime);
         
         if (r->request_time - rr->finfo.mtime > 
             180 * 24 * 60 * 60 * APR_USEC_PER_SEC) {