forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed spaces -> tabs and a 32/64 bit issue

This commit is contained in:
Hackerpilot 2013-08-18 16:53:29 +00:00
parent 796919294a
commit ec0f7ff79f
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client.d
View File

@ -70,8 +70,8 @@ int main(string[] args)
ubyte[] message = msgpack.pack(request); ubyte[] message = msgpack.pack(request);
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof]; ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length; auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8]; messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[8 .. $] = message[]; messageBuffer[size_t.sizeof .. $] = message[];
return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1; return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1;
} }
else if (importPaths.length > 0) else if (importPaths.length > 0)
@ -87,8 +87,8 @@ int main(string[] args)
ubyte[] message = msgpack.pack(request); ubyte[] message = msgpack.pack(request);
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof]; ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length; auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8]; messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[8 .. $] = message[]; messageBuffer[size_t.sizeof .. $] = message[];
return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1; return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1;
} }
else if (cursorPos == size_t.max) else if (cursorPos == size_t.max)
@ -141,8 +141,8 @@ int main(string[] args)
socket.blocking = true; socket.blocking = true;
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof]; ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length; auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8]; messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[8 .. $] = message[]; messageBuffer[size_t.sizeof .. $] = message[];
auto bytesSent = socket.send(messageBuffer); auto bytesSent = socket.send(messageBuffer);
// Get response and write it out // Get response and write it out

8
server.d
View File

@ -71,7 +71,7 @@ int main(string[] args)
ModuleCache.addImportPath(path); ModuleCache.addImportPath(path);
writeln("Import directories: ", ModuleCache.getImportPaths()); writeln("Import directories: ", ModuleCache.getImportPaths());
ubyte[1024 * 1024 * 4] buffer = void; // 4 megabytes should be enough for anybody... ubyte[] buffer = new ubyte[1024 * 1024 * 4]; // 4 megabytes should be enough for anybody...
writeln("Startup complete"); writeln("Startup complete");
@ -87,8 +87,8 @@ int main(string[] args)
ptrdiff_t bytesReceived = s.receive(buffer); ptrdiff_t bytesReceived = s.receive(buffer);
size_t messageLength; size_t messageLength;
// bit magic! // bit magic!
(cast(ubyte*) &messageLength)[0..8] = buffer[0..8]; (cast(ubyte*) &messageLength)[0..size_t.sizeof] = buffer[0..size_t.sizeof];
while (bytesReceived < messageLength + 8) while (bytesReceived < messageLength + size_t.sizeof)
{ {
auto b = s.receive(buffer[bytesReceived .. $]); auto b = s.receive(buffer[bytesReceived .. $]);
if (b == Socket.ERROR) if (b == Socket.ERROR)
@ -106,7 +106,7 @@ int main(string[] args)
} }
AutocompleteRequest request; AutocompleteRequest request;
msgpack.unpack(buffer[8 .. bytesReceived], request); msgpack.unpack(buffer[size_t.sizeof .. bytesReceived], request);
if (request.kind == RequestKind.addImport) if (request.kind == RequestKind.addImport)
{ {
foreach (path; request.importPaths) foreach (path; request.importPaths)