@@ -110,7 +110,7 @@ pub const PostgresClient = struct {
110110 _ = try stream .writeAll (startup_msg );
111111
112112 // Handle authentication
113- try self . handleAuthentication (& stream );
113+ try handleAuthentication (& stream );
114114
115115 // Wait for ReadyForQuery
116116 try self .waitForReady (& stream );
@@ -156,7 +156,7 @@ pub const PostgresClient = struct {
156156 }
157157
158158 /// Handle authentication response from server
159- fn handleAuthentication (self : * PostgresClient , stream : * net.Stream ) ! void {
159+ fn handleAuthentication (stream : * net.Stream ) ! void {
160160 var len_buf : [4 ]u8 = undefined ;
161161 _ = try stream .readAll (& len_buf );
162162 const msg_len = std .mem .readInt (u32 , & len_buf , .big );
@@ -281,7 +281,7 @@ pub const PostgresClient = struct {
281281 try row .values .append ("" );
282282 } else {
283283 const value_len_usize = @as (usize , @intCast (value_len ));
284- var value_buf = try self .allocator .alloc (u8 , value_len_usize );
284+ const value_buf = try self .allocator .alloc (u8 , value_len_usize );
285285 _ = try stream .readAll (value_buf );
286286 try row .values .append (value_buf );
287287 try row .columns .append ("" ); // Column name not in DataRow
@@ -294,7 +294,7 @@ pub const PostgresClient = struct {
294294 }
295295
296296 /// Read and parse error response
297- fn readErrorResponse (self : * PostgresClient , stream : * net.Stream , len : u32 ) ! void {
297+ fn readErrorResponse (stream : * net.Stream , len : u32 ) ! void {
298298 var message : [256 ]u8 = undefined ;
299299 var message_len : usize = 0 ;
300300
@@ -326,7 +326,7 @@ pub const PostgresClient = struct {
326326}
327327
328328 /// Skip a message
329- fn skipMessage (self : * PostgresClient , stream : * net.Stream , len : u32 ) ! void {
329+ fn skipMessage (stream : * net.Stream , len : u32 ) ! void {
330330 var buf : [1024 ]u8 = undefined ;
331331 var remaining : u32 = len ;
332332
@@ -415,29 +415,29 @@ pub fn buildStartupMessage(allocator: Allocator, user: []const u8, database: []c
415415 var offset : usize = 0 ;
416416
417417 // Message length (including self, excluding length field)
418- std .mem .writeInt (u32 , msg [offset .. ][ 0.. 4], @intCast (size - 4 ), .big );
418+ std .mem .writeInt (u32 , msg [0.. 4], @intCast (size - 4 ), .big );
419419 offset += 4 ;
420420
421421 // Protocol version 3.0
422- std .mem .writeInt (u32 , msg [offset .. ][0 .. 4 ], PROTOCOL_VERSION , .big );
422+ std .mem .writeInt (u32 , msg [4 .. 8 ], PROTOCOL_VERSION , .big );
423423 offset += 4 ;
424424
425425 // User parameter
426- @memcpy (msg [offset .. ][0 .. 5], "user" );
426+ @memcpy (msg [offset .. offset + 5 ], "user" );
427427 offset += 5 ;
428428 msg [offset ] = 0 ;
429429 offset += 1 ;
430- @memcpy (msg [offset .. ][0 .. user .len ], user );
430+ @memcpy (msg [offset .. offset + user .len ], user );
431431 offset += user .len ;
432432 msg [offset ] = 0 ;
433433 offset += 1 ;
434434
435435 // Database parameter
436- @memcpy (msg [offset .. ][0 .. 9], "database" );
436+ @memcpy (msg [offset .. offset + 9 ], "database" );
437437 offset += 9 ;
438438 msg [offset ] = 0 ;
439439 offset += 1 ;
440- @memcpy (msg [offset .. ][0 .. database .len ], database );
440+ @memcpy (msg [offset .. offset + database .len ], database );
441441 offset += database .len ;
442442 msg [offset ] = 0 ;
443443 offset += 1 ;
@@ -457,8 +457,8 @@ pub fn buildQueryMessage(allocator: Allocator, sql: []const u8) ![]u8 {
457457 errdefer allocator .free (msg );
458458
459459 msg [0 ] = @intFromEnum (MessageType .Query );
460- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], @intCast (sql .len + 1 ), .big );
461- @memcpy (msg [5.. ][0 .. sql .len ], sql );
460+ std .mem .writeInt (u32 , msg [1.. 5 ], @intCast (sql .len + 1 ), .big );
461+ @memcpy (msg [5.. 5 + sql .len ], sql );
462462 msg [5 + sql .len ] = 0 ;
463463
464464 return msg ;
@@ -473,8 +473,8 @@ pub fn buildAuthenticationOk(allocator: Allocator) ![]u8 {
473473 errdefer allocator .free (msg );
474474
475475 msg [0 ] = @intFromEnum (MessageType .AuthenticationOk );
476- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], 4 , .big ); // length of auth_code
477- std .mem .writeInt (u32 , msg [5.. ][0 .. 4 ], 0 , .big ); // AUTH_OK
476+ std .mem .writeInt (u32 , msg [1.. 5 ], 4 , .big ); // length of auth_code
477+ std .mem .writeInt (u32 , msg [5.. 9 ], 0 , .big ); // AUTH_OK
478478
479479 return msg ;
480480}
@@ -489,9 +489,9 @@ pub fn buildBackendKeyData(allocator: Allocator, pid: i32, key: i32) ![]u8 {
489489 errdefer allocator .free (msg );
490490
491491 msg [0 ] = @intFromEnum (MessageType .BackendKeyData );
492- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], 8 , .big );
493- std .mem .writeInt (i32 , msg [5.. ][0 .. 4 ], pid , .big );
494- std .mem .writeInt (i32 , msg [9.. ][0 .. 4 ], key , .big );
492+ std .mem .writeInt (u32 , msg [1.. 5 ], 8 , .big );
493+ std .mem .writeInt (i32 , msg [5.. 9 ], pid , .big );
494+ std .mem .writeInt (i32 , msg [9.. 13 ], key , .big );
495495
496496 return msg ;
497497}
@@ -506,7 +506,7 @@ pub fn buildReadyForQuery(allocator: Allocator, status: TransactionStatus) ![]u8
506506 errdefer allocator .free (msg );
507507
508508 msg [0 ] = @intFromEnum (MessageType .ReadyForQuery );
509- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], 1 , .big );
509+ std .mem .writeInt (u32 , msg [1.. 5 ], 1 , .big );
510510 msg [5 ] = @intFromEnum (status );
511511
512512 return msg ;
@@ -522,8 +522,8 @@ pub fn buildCommandComplete(allocator: Allocator, tag: []const u8) ![]u8 {
522522 errdefer allocator .free (msg );
523523
524524 msg [0 ] = @intFromEnum (MessageType .CommandComplete );
525- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], @intCast (tag .len + 1 ), .big );
526- @memcpy (msg [5.. ][0 .. tag .len ], tag );
525+ std .mem .writeInt (u32 , msg [1.. 5 ], @intCast (tag .len + 1 ), .big );
526+ @memcpy (msg [5.. 5 + tag .len ], tag );
527527 msg [5 + tag .len ] = 0 ;
528528
529529 return msg ;
@@ -540,9 +540,9 @@ pub fn buildErrorResponse(allocator: Allocator, message: []const u8) ![]u8 {
540540 errdefer allocator .free (msg );
541541
542542 msg [0 ] = @intFromEnum (MessageType .ErrorResponse );
543- std .mem .writeInt (u32 , msg [1.. ][0 .. 4 ], @intCast (size - 5 ), .big );
543+ std .mem .writeInt (u32 , msg [1.. 5 ], @intCast (size - 5 ), .big );
544544 msg [5 ] = 'M' ; // Message field
545- @memcpy (msg [6.. ][0 .. message .len ], message );
545+ @memcpy (msg [6.. 6 + message .len ], message );
546546 msg [6 + message .len ] = 0 ; // Null terminator for value
547547 msg [6 + message .len + 1 ] = 0 ; // Terminator
548548
0 commit comments