All pastes #558727 Raw Edit

Anonymous

public text v1 · immutable
·published 2007-06-11 14:03 UTC
rendered paste body
.../xlog.git$ git diff src/ > ../git-diff.patch

diff --git a/src/logfile/cabrillo.c b/src/logfile/cabrillo.c
index 2c8d627..2fa1a52 100644
--- a/src/logfile/cabrillo.c
+++ b/src/logfile/cabrillo.c
@@ -157,7 +157,7 @@ cabrillo_qso_append (LOGDB * handle, const qso_t * q)
         * there's no exchange fields in xlog. However, the exchange information         * may be piggybacked by the rst field. eg. "599ON".
         */
-       if (!strcmp (q_mode, "SSB") || !strcmp (q_mode, "LSB")
+       if (!strcmp (q_mode, "SSB") || !strcmp (q_mode, "USB")
                        || !strcmp (q_mode, "LSB") || !strcmp (q_mode, "FM"))
                rst_len = 2;
        else




trying to apply to:
.../xlog-1.4$ patch -p1 < ../git-diff.patch

	/*
	 * there's no exchange fields in xlog. However, the exchange information
	 * may be piggybacked by the rst field. eg. "599ON".
	 */
	if (!strcmp (q_mode, "SSB") || !strcmp (q_mode, "LSB") 
			|| !strcmp (q_mode, "LSB") || !strcmp (q_mode, "FM"))
		rst_len = 2;
	else 
		rst_len = 3;

.../xlog-1.4/src/logfile/cabrillo.c.rej:

*************** cabrillo_qso_append (LOGDB * handle, const qso_t * q)
*** 157,163 ****
         * there's no exchange fields in xlog. However, the exchange information         * may be piggybacked by the rst field. eg. "599ON".
         */
-       if (!strcmp (q_mode, "SSB") || !strcmp (q_mode, "LSB")
                        || !strcmp (q_mode, "LSB") || !strcmp (q_mode, "FM"))
                rst_len = 2;
        else
--- 157,163 ----
         * there's no exchange fields in xlog. However, the exchange information         * may be piggybacked by the rst field. eg. "599ON".
         */
+       if (!strcmp (q_mode, "SSB") || !strcmp (q_mode, "USB")
                        || !strcmp (q_mode, "LSB") || !strcmp (q_mode, "FM"))
                rst_len = 2;
        else