You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/17 15:26:44 UTC
svn commit: r945141 - in /trafficserver/traffic/trunk/proxy/mgmt2:
cli2/cliMain.cc cop/TrafficCop.cc tools/McastSnoop.cc tools/VIPConfig.cc
Author: mturk
Date: Mon May 17 13:26:43 2010
New Revision: 945141
URL: http://svn.apache.org/viewvc?rev=945141&view=rev
Log:
Consume some ink_file api so that libinktomi++ gets linked in
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc?rev=945141&r1=945140&r2=945141&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc Mon May 17 13:26:43 2010
@@ -59,10 +59,6 @@ main(int argc, char *argv[])
// Before accessing file system initialize Layout engine
create_default_layout();
- // TODO: Figure out why is this needed
- if (argc < 0) {
- ink_ftell(stdout);
- }
// Argument description table used to describe how to parse command line args,
// see 'ink_args.h' for meanings of the various fields
@@ -78,7 +74,7 @@ main(int argc, char *argv[])
// check for the version number request
if (version_flag) {
- fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
+ ink_fputln(stderr, appVersionInfo.FullVersionInfoStr);
exit(0);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=945141&r1=945140&r2=945141&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Mon May 17 13:26:43 2010
@@ -1932,16 +1932,13 @@ main(int argc, char *argv[])
// Before accessing file system initialize Layout engine
create_default_layout();
- // TODO: Figure out why is this needed
- if (argc < 0) {
- ink_ftell(stdout);
- }
+
for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "-stop") == 0) {
- fprintf(stdout, "Cool! I think I'll be a STOP cop!\n");
+ ink_fputln(stdout, "Cool! I think I'll be a STOP cop!");
killsig = SIGSTOP;
} else if (strcmp(argv[i], "-V") == 0) {
- fprintf(stderr, "%s\n", appVersionInfo.FullVersionInfoStr);
+ ink_fputln(stderr, appVersionInfo.FullVersionInfoStr);
exit(0);
}
}
@@ -1967,7 +1964,7 @@ main(int argc, char *argv[])
fcntl(fd, F_DUPFD, STDERR_FILENO);
close(fd);
} else {
- fprintf(stdout, "Unable to open /dev/null\n");
+ ink_fputln(stderr, "Unable to open /dev/null");
return 0;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc?rev=945141&r1=945140&r2=945141&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc Mon May 17 13:26:43 2010
@@ -288,17 +288,13 @@ main(int argc, char **argv)
process_args(argument_descriptions, n_argument_descriptions, argv);
// Before accessing file system initialize Layout engine
create_default_layout();
- // TODO: Figure out why is this needed
- if (argc < 0) {
- ink_ftell(stdout);
- }
init();
int fd = establishReceiveChannel(mcast_group, mcast_port);
if (fd < 0) {
- fprintf(stderr, "Failed to setup multicast channel\n");
+ ink_fputln(stderr, "Failed to setup multicast channel");
exit(1);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc?rev=945141&r1=945140&r2=945141&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc Mon May 17 13:26:43 2010
@@ -82,15 +82,9 @@ main(int argc, char **argv)
// Before accessing file system initialize Layout engine
create_default_layout();
- // TODO: Figure out why is this needed
- if (argc < 0) {
- ink_ftell(stdout);
- }
if (argc != 6 || (argc != 2 && strstr(argv[1], "help"))) {
-#ifdef DEBUG
- fprintf(stderr, "[vip_config] Usage incorrect(1)\n");
-#endif
+ ink_fputln(stderr, "[vip_config] Usage incorrect(1)");
exit(1);
} else { /* Handle args */
@@ -100,7 +94,7 @@ main(int argc, char **argv)
operation = DOWN_INTERFACE;
} else {
#ifdef DEBUG
- fprintf(stderr, "[vip_config] Usage incorrect(2)\n");
+ ink_fputln(stderr, "[vip_config] Usage incorrect(2)");
#endif
exit(1);
}