summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorthommay <thommay@13f79535-47bb-0310-9956-ffa450edef68>2002-11-20 03:50:23 +0000
committerthommay <thommay@13f79535-47bb-0310-9956-ffa450edef68>2002-11-20 03:50:23 +0000
commit96a516ce915baab6aeac8564383d7203def7ca42 (patch)
tree970704b99664fde6f1803a70c4287a9326c2b7c4 /misc
parentf50ebd72d64ef2df0165d62d139dbfb0b70c3b4d (diff)
downloadlibapr-96a516ce915baab6aeac8564383d7203def7ca42.tar.gz
*) Renames done (deprecated functions wrapped):
apr_filename_of_pathname -> apr_filepath_name_get apr_get_groupid -> apr_gid_get apr_get_groupname -> apr_gid_name_get apr_compare_groups -> apr_gid_compare apr_parse_addr_port -> apr_port_addr_parse apr_shutdown -> apr_socket_shutdown apr_bind -> apr_socket_bind apr_listen -> apr_socket_listen apr_accept -> apr_socket_accept apr_connect -> apr_socket_connect apr_send -> apr_socket_send apr_sendv -> apr_socket_sendv apr_sendto -> apr_socket_sendto apr_implode_gmt -> apr_time_exp_gmt_get apr_get_home_directory -> apr_uid_homepath_get apr_get_userid -> apr_uid_get apr_current_userid -> apr_uid_current apr_compare_users -> apr_uid_compare apr_get_username -> apr_uid_name_get apr_recvfrom -> apr_socket_recvfrom apr_sendfile -> apr_socket_sendfile apr_recv -> apr_socket_recv git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64043 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
-rw-r--r--misc/unix/getopt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c
index 2a8b7d1a4..1e0911710 100644
--- a/misc/unix/getopt.c
+++ b/misc/unix/getopt.c
@@ -101,7 +101,7 @@ APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts,
++os->ind;
if (os->errfn && *opts != ':') {
(os->errfn)(os->errarg, "%s: illegal option -- %c\n",
- apr_filename_of_pathname(*os->argv), os->opt);
+ apr_filepath_name_get(*os->argv), os->opt);
}
*optch = os->opt;
return (APR_BADCH);
@@ -123,7 +123,7 @@ APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts,
if (os->errfn) {
(os->errfn)(os->errarg,
"%s: option requires an argument -- %c\n",
- apr_filename_of_pathname(*os->argv), os->opt);
+ apr_filepath_name_get(*os->argv), os->opt);
}
*optch = os->opt;
return (APR_BADCH);
@@ -183,7 +183,7 @@ static apr_status_t serr(apr_getopt_t *os, const char *err, const char *str,
{
if (os->errfn)
(os->errfn)(os->errarg, "%s: %s: %s\n",
- apr_filename_of_pathname(*os->argv), err, str);
+ apr_filepath_name_get(*os->argv), err, str);
return status;
}
@@ -193,7 +193,7 @@ static apr_status_t cerr(apr_getopt_t *os, const char *err, int ch,
{
if (os->errfn)
(os->errfn)(os->errarg, "%s: %s: %c\n",
- apr_filename_of_pathname(*os->argv), err, ch);
+ apr_filepath_name_get(*os->argv), err, ch);
return status;
}