improve parsing argv a bit

master
Andrzej Rybczak 18 years ago
parent 80aba9295a
commit 5b1dbf2aed
  1. 7
      src/helpers.cpp
  2. 2
      src/helpers.h
  3. 6
      src/ncmpcpp.cpp

@ -65,11 +65,16 @@ bool ConnectToMPD()
return true;
}
bool ParseArgv(vector<string> &v)
bool ParseArgv(int argc, char **argv)
{
using std::cout;
using std::endl;
vector<string> v;
v.reserve(argc-1);
for (int i = 1; i < argc; i++)
v.push_back(argv[i]);
bool exit = 0;
for (vector<string>::iterator it = v.begin(); it != v.end() && !exit; it++)
{

@ -28,7 +28,7 @@
extern ncmpcpp_config Config;
bool ConnectToMPD();
bool ParseArgv(vector<string> &);
bool ParseArgv(int, char **);
void LockStatusbar();
void UnlockStatusbar();

@ -176,11 +176,7 @@ int main(int argc, char *argv[])
if (argc > 1)
{
vector<string> args;
args.reserve(argc-1);
for (int i = 1; i < argc; i++)
args.push_back(argv[i]);
if (ParseArgv(args))
if (ParseArgv(argc, argv))
{
Mpd->Disconnect();
return 0;

Loading…
Cancel
Save