@@ -101,7 +101,7 @@ int packet_flush_gently(int fd)
101
101
{
102
102
packet_trace ("0000" , 4 , 1 );
103
103
if (write_in_full (fd , "0000" , 4 ) < 0 )
104
- return error ("flush packet write failed" );
104
+ return error (_ ( "flush packet write failed" ) );
105
105
return 0 ;
106
106
}
107
107
@@ -139,7 +139,7 @@ static void format_packet(struct strbuf *out, const char *fmt, va_list args)
139
139
n = out -> len - orig_len ;
140
140
141
141
if (n > LARGE_PACKET_MAX )
142
- die ("protocol error: impossibly long line" );
142
+ die (_ ( "protocol error: impossibly long line" ) );
143
143
144
144
set_packet_header (& out -> buf [orig_len ], n );
145
145
packet_trace (out -> buf + orig_len + 4 , n - 4 , 1 );
@@ -155,9 +155,9 @@ static int packet_write_fmt_1(int fd, int gently,
155
155
if (write_in_full (fd , buf .buf , buf .len ) < 0 ) {
156
156
if (!gently ) {
157
157
check_pipe (errno );
158
- die_errno ("packet write with format failed" );
158
+ die_errno (_ ( "packet write with format failed" ) );
159
159
}
160
- return error ("packet write with format failed" );
160
+ return error (_ ( "packet write with format failed" ) );
161
161
}
162
162
163
163
return 0 ;
@@ -189,21 +189,21 @@ static int packet_write_gently(const int fd_out, const char *buf, size_t size)
189
189
size_t packet_size ;
190
190
191
191
if (size > sizeof (packet_write_buffer ) - 4 )
192
- return error ("packet write failed - data exceeds max packet size" );
192
+ return error (_ ( "packet write failed - data exceeds max packet size" ) );
193
193
194
194
packet_trace (buf , size , 1 );
195
195
packet_size = size + 4 ;
196
196
set_packet_header (packet_write_buffer , packet_size );
197
197
memcpy (packet_write_buffer + 4 , buf , size );
198
198
if (write_in_full (fd_out , packet_write_buffer , packet_size ) < 0 )
199
- return error ("packet write failed" );
199
+ return error (_ ( "packet write failed" ) );
200
200
return 0 ;
201
201
}
202
202
203
203
void packet_write (int fd_out , const char * buf , size_t size )
204
204
{
205
205
if (packet_write_gently (fd_out , buf , size ))
206
- die_errno ("packet write failed" );
206
+ die_errno (_ ( "packet write failed" ) );
207
207
}
208
208
209
209
void packet_buf_write (struct strbuf * buf , const char * fmt , ...)
@@ -225,7 +225,7 @@ void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
225
225
n = buf -> len - orig_len ;
226
226
227
227
if (n > LARGE_PACKET_MAX )
228
- die ("protocol error: impossibly long line" );
228
+ die (_ ( "protocol error: impossibly long line" ) );
229
229
230
230
set_packet_header (& buf -> buf [orig_len ], n );
231
231
packet_trace (data , len , 1 );
@@ -288,15 +288,15 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
288
288
} else {
289
289
ret = read_in_full (fd , dst , size );
290
290
if (ret < 0 )
291
- die_errno ("read error" );
291
+ die_errno (_ ( "read error" ) );
292
292
}
293
293
294
294
/* And complain if we didn't get enough bytes to satisfy the read. */
295
295
if (ret != size ) {
296
296
if (options & PACKET_READ_GENTLE_ON_EOF )
297
297
return -1 ;
298
298
299
- die ("the remote end hung up unexpectedly" );
299
+ die (_ ( "the remote end hung up unexpectedly" ) );
300
300
}
301
301
302
302
return ret ;
@@ -324,7 +324,7 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
324
324
len = packet_length (linelen );
325
325
326
326
if (len < 0 ) {
327
- die ("protocol error: bad line length character: %.4s" , linelen );
327
+ die (_ ( "protocol error: bad line length character: %.4s" ) , linelen );
328
328
} else if (!len ) {
329
329
packet_trace ("0000" , 4 , 0 );
330
330
* pktlen = 0 ;
@@ -334,12 +334,12 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
334
334
* pktlen = 0 ;
335
335
return PACKET_READ_DELIM ;
336
336
} else if (len < 4 ) {
337
- die ("protocol error: bad line length %d" , len );
337
+ die (_ ( "protocol error: bad line length %d" ) , len );
338
338
}
339
339
340
340
len -= 4 ;
341
341
if ((unsigned )len >= size )
342
- die ("protocol error: bad line length %d" , len );
342
+ die (_ ( "protocol error: bad line length %d" ) , len );
343
343
344
344
if (get_packet_data (fd , src_buffer , src_len , buffer , len , options ) < 0 ) {
345
345
* pktlen = -1 ;
0 commit comments