Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced use of vector with BList

Browse Source 
enables to build correctly with gcc4


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18936 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-09-25 21:53:56 +00:00
parent e2ba090e41
commit afa5a46239
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/hey.cpp
View File

@ -104,13 +104,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vector>
#include <AppKit.h> #include <AppKit.h>
#include <Path.h> #include <Path.h>
#include <SupportDefs.h> #include <SupportDefs.h>
using std::vector;
int32 HeyInterpreterThreadHook(void* arg); int32 HeyInterpreterThreadHook(void* arg);
status_t Hey(BMessenger* target, const char* arg, BMessage* reply); status_t Hey(BMessenger* target, const char* arg, BMessage* reply);
@ -347,7 +344,7 @@ HeyInterpreterThreadHook(void* arg)
status_t status_t
Hey(BMessenger* target, const char* arg, BMessage* reply) Hey(BMessenger* target, const char* arg, BMessage* reply)
{ {
vector<char*> argv; // number of tokens is now limited only by memory -- pfolk@uni.uiuc.edu 1999-11-03 BList argv; // number of tokens is now limited only by memory -- pfolk@uni.uiuc.edu 1999-11-03
char* tokens = new char[strlen(arg)*2]; char* tokens = new char[strlen(arg)*2];
char* currentToken = tokens; char* currentToken = tokens;
int32 tokenNdex = 0; int32 tokenNdex = 0;
@ -360,7 +357,7 @@ Hey(BMessenger* target, const char* arg, BMessage* reply)
if (!inquotes && isSpace(arg[argNdex])) { // if the character is white space if (!inquotes && isSpace(arg[argNdex])) { // if the character is white space
if (tokenNdex!=0) { // close off currentToken token if (tokenNdex!=0) { // close off currentToken token
currentToken[tokenNdex] = 0; currentToken[tokenNdex] = 0;
argv.push_back(currentToken); argv.AddItem(currentToken);
currentToken += tokenNdex+1; currentToken += tokenNdex+1;
tokenNdex=0; tokenNdex=0;
argNdex++; argNdex++;
@ -376,12 +373,12 @@ Hey(BMessenger* target, const char* arg, BMessage* reply)
if (tokenNdex!=0) { // close off currentToken token if (tokenNdex!=0) { // close off currentToken token
currentToken[tokenNdex] = 0; currentToken[tokenNdex] = 0;
argv.push_back(currentToken); argv.AddItem(currentToken);
} }
argv.push_back(NULL); argv.AddItem(NULL);
int32 argx = 0; int32 argx = 0;
status_t ret = Hey(target, argv.begin(), &argx, argv.size()-1, reply); status_t ret = Hey(target, (char **)argv.Items(), &argx, argv.CountItems()-1, reply);
// This used to be "return Hey(...);"---so tokens wasn't delete'd. -- pfolk@uni.uiuc.edu 1999-11-03 // This used to be "return Hey(...);"---so tokens wasn't delete'd. -- pfolk@uni.uiuc.edu 1999-11-03
delete tokens; delete tokens;
return ret; return ret;