pkt-line: drop safe_write function

This is just write_or_die by another name. The one
distinction is that write_or_die will treat EPIPE specially
by suppressing error messages. That's fine, as we die by
SIGPIPE anyway (and in the off chance that it is disabled,
write_or_die will simulate it).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 62ba6e7a3d014be01fe01ed497c083f7e44e9d34..912956378247c4de5c33654cded00b2e13dca491 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -932,7 +932,7 @@ static void report(struct command *commands, const char *unpack_status)
        if (use_sideband)
                send_sideband(1, 1, buf.buf, buf.len, use_sideband);
        else
        if (use_sideband)
                send_sideband(1, 1, buf.buf, buf.len, use_sideband);
        else

-               safe_write(1, buf.buf, buf.len);
+               write_or_die(1, buf.buf, buf.len);

        strbuf_release(&buf);
 }
 
        strbuf_release(&buf);
 }
 

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 57a46b2654aa82b154d32eb77addd6a4f89c8e8d..87785197cd2e801f8cf5bf06b97ef030be2f7fba 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -79,7 +79,7 @@ static void print_helper_status(struct ref *ref)
                }
                strbuf_addch(&buf, '\n');
 
                }
                strbuf_addch(&buf, '\n');
 

-               safe_write(1, buf.buf, buf.len);
+               write_or_die(1, buf.buf, buf.len);

        }
        strbuf_release(&buf);
 }
        }
        strbuf_release(&buf);
 }

diff --git a/fetch-pack.c b/fetch-pack.c
index 27a3e8036474eb18501a79a053bcba84317f52fe..b53a18f923758001e631da0b650dcca6663e6897 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -247,7 +247,7 @@ static void send_request(struct fetch_pack_args *args,
                send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
                packet_flush(fd);
        } else
                send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
                packet_flush(fd);
        } else

-               safe_write(fd, buf->buf, buf->len);
+               write_or_die(fd, buf->buf, buf->len);

 }
 
 static void insert_one_alternate_ref(const struct ref *ref, void *unused)
 }
 
 static void insert_one_alternate_ref(const struct ref *ref, void *unused)

diff --git a/http-backend.c b/http-backend.c
index f50e77fb2890207bd7385b59bdd561133991c910..8144f3ad5eb68c789fd031921e6e702170310d68 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -70,7 +70,7 @@ static void format_write(int fd, const char *fmt, ...)
        if (n >= sizeof(buffer))
                die("protocol error: impossibly long line");
 
        if (n >= sizeof(buffer))
                die("protocol error: impossibly long line");
 

-       safe_write(fd, buffer, n);
+       write_or_die(fd, buffer, n);

 }
 
 static void http_status(unsigned code, const char *msg)
 }
 
 static void http_status(unsigned code, const char *msg)


@@ -111,7 +111,7 @@ static void hdr_cache_forever(void)
 
 static void end_headers(void)
 {
 
 static void end_headers(void)
 {

-       safe_write(1, "\r\n", 2);
+       write_or_die(1, "\r\n", 2);

 }
 
 __attribute__((format (printf, 1, 2)))
 }
 
 __attribute__((format (printf, 1, 2)))


@@ -157,7 +157,7 @@ static void send_strbuf(const char *type, struct strbuf *buf)
        hdr_int(content_length, buf->len);
        hdr_str(content_type, type);
        end_headers();
        hdr_int(content_length, buf->len);
        hdr_str(content_type, type);
        end_headers();

-       safe_write(1, buf->buf, buf->len);
+       write_or_die(1, buf->buf, buf->len);

 }
 
 static void send_local_file(const char *the_type, const char *name)
 }
 
 static void send_local_file(const char *the_type, const char *name)


@@ -185,7 +185,7 @@ static void send_local_file(const char *the_type, const char *name)
                        die_errno("Cannot read '%s'", p);
                if (!n)
                        break;
                        die_errno("Cannot read '%s'", p);
                if (!n)
                        break;

-               safe_write(1, buf, n);
+               write_or_die(1, buf, n);

        }
        close(fd);
        free(buf);
        }
        close(fd);
        free(buf);

diff --git a/pkt-line.c b/pkt-line.c
index 5138f47b645325592b3403b48b2282b94b5269d7..699c2dd3b9a60c147f71cd9e0a6f0e52c548c2f1 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -46,23 +46,6 @@ static void packet_trace(const char *buf, unsigned int len, int write)
        strbuf_release(&out);
 }
 
        strbuf_release(&out);
 }
 

-ssize_t safe_write(int fd, const void *buf, ssize_t n)
-{
-       ssize_t nn = n;
-       while (n) {
-               int ret = xwrite(fd, buf, n);
-               if (ret > 0) {
-                       buf = (char *) buf + ret;
-                       n -= ret;
-                       continue;
-               }
-               if (!ret)
-                       die("write error (disk full?)");
-               die_errno("write error");
-       }
-       return nn;
-}
-

 /*
  * If we buffered things up above (we don't, but we should),
  * we'd flush it here
 /*
  * If we buffered things up above (we don't, but we should),
  * we'd flush it here


@@ -70,7 +53,7 @@ ssize_t safe_write(int fd, const void *buf, ssize_t n)
 void packet_flush(int fd)
 {
        packet_trace("0000", 4, 1);
 void packet_flush(int fd)
 {
        packet_trace("0000", 4, 1);

-       safe_write(fd, "0000", 4);
+       write_or_die(fd, "0000", 4);

 }
 
 void packet_buf_flush(struct strbuf *buf)
 }
 
 void packet_buf_flush(struct strbuf *buf)


@@ -106,7 +89,7 @@ void packet_write(int fd, const char *fmt, ...)
        va_start(args, fmt);
        n = format_packet(fmt, args);
        va_end(args);
        va_start(args, fmt);
        n = format_packet(fmt, args);
        va_end(args);

-       safe_write(fd, buffer, n);
+       write_or_die(fd, buffer, n);

 }
 
 void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
 }
 
 void packet_buf_write(struct strbuf *buf, const char *fmt, ...)

diff --git a/pkt-line.h b/pkt-line.h
index 7a67e9c65be2621bff63d6828c59f13d87c4a583..3b6c19c4e46449aa366acdde85b6d5498257e0cd 100644 (file)
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -27,6 +27,5 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
 int packet_read_line(int fd, char *buffer, unsigned size);
 int packet_read(int fd, char *buffer, unsigned size);
 int packet_get_line(struct strbuf *out, char **src_buf, size_t *src_len);
 int packet_read_line(int fd, char *buffer, unsigned size);
 int packet_read(int fd, char *buffer, unsigned size);
 int packet_get_line(struct strbuf *out, char **src_buf, size_t *src_len);

-ssize_t safe_write(int, const void *, ssize_t);

 
 #endif
 
 #endif

diff --git a/remote-curl.c b/remote-curl.c
index 933c69ac2627c1903276b92b457843e12649f39e..7be4b53495647ebf06b50bd22a37678481bfcb3a 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -685,7 +685,7 @@ static int fetch_git(struct discovery *heads,
 
        err = rpc_service(&rpc, heads);
        if (rpc.result.len)
 
        err = rpc_service(&rpc, heads);
        if (rpc.result.len)

-               safe_write(1, rpc.result.buf, rpc.result.len);
+               write_or_die(1, rpc.result.buf, rpc.result.len);

        strbuf_release(&rpc.result);
        strbuf_release(&preamble);
        free(depth_arg);
        strbuf_release(&rpc.result);
        strbuf_release(&preamble);
        free(depth_arg);


@@ -805,7 +805,7 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
 
        err = rpc_service(&rpc, heads);
        if (rpc.result.len)
 
        err = rpc_service(&rpc, heads);
        if (rpc.result.len)

-               safe_write(1, rpc.result.buf, rpc.result.len);
+               write_or_die(1, rpc.result.buf, rpc.result.len);

        strbuf_release(&rpc.result);
        free(argv);
        return err;
        strbuf_release(&rpc.result);
        free(argv);
        return err;

diff --git a/send-pack.c b/send-pack.c
index e91cbe2c957003c98fcefee82f546101cdd13a9f..bde796b1bbb80aca5c3e39c0b0365dcbb43b9c09 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -280,7 +280,7 @@ int send_pack(struct send_pack_args *args,
                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
                }
        } else {
                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
                }
        } else {

-               safe_write(out, req_buf.buf, req_buf.len);
+               write_or_die(out, req_buf.buf, req_buf.len);

                packet_flush(out);
        }
        strbuf_release(&req_buf);
                packet_flush(out);
        }
        strbuf_release(&req_buf);

diff --git a/sideband.c b/sideband.c
index d5ffa1c8919a6db750606c78a1b44d8618fa35a5..8f7b25bf7915ec80d55d8a9f6fa6a8953b495204 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -1,3 +1,4 @@
+#include "cache.h"

 #include "pkt-line.h"
 #include "sideband.h"
 
 #include "pkt-line.h"
 #include "sideband.h"
 


@@ -108,7 +109,7 @@ int recv_sideband(const char *me, int in_stream, int out)
                        } while (len);
                        continue;
                case 1:
                        } while (len);
                        continue;
                case 1:

-                       safe_write(out, buf + pf+1, len);
+                       write_or_die(out, buf + pf+1, len);

                        continue;
                default:
                        fprintf(stderr, "%s: protocol error: bad band #%d\n",
                        continue;
                default:
                        fprintf(stderr, "%s: protocol error: bad band #%d\n",


@@ -138,12 +139,12 @@ ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet
                if (0 <= band) {
                        sprintf(hdr, "%04x", n + 5);
                        hdr[4] = band;
                if (0 <= band) {
                        sprintf(hdr, "%04x", n + 5);
                        hdr[4] = band;

-                       safe_write(fd, hdr, 5);
+                       write_or_die(fd, hdr, 5);

                } else {
                        sprintf(hdr, "%04x", n + 4);
                } else {
                        sprintf(hdr, "%04x", n + 4);

-                       safe_write(fd, hdr, 4);
+                       write_or_die(fd, hdr, 4);

                }
                }

-               safe_write(fd, p, n);
+               write_or_die(fd, p, n);

                p += n;
                sz -= n;
        }
                p += n;
                sz -= n;
        }

diff --git a/upload-pack.c b/upload-pack.c
index 0edc79e4a40f3bc4eca6c7619b898c1154c30730..afc2d9279cdcd57b235cbf69590ffc102f2397b5 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -69,7 +69,8 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
                xwrite(fd, data, sz);
                return sz;
        }
                xwrite(fd, data, sz);
                return sz;
        }

-       return safe_write(fd, data, sz);
+       write_or_die(fd, data, sz);
+       return sz;

 }
 
 static FILE *pack_pipe = NULL;
 }
 
 static FILE *pack_pipe = NULL;