gpg: Keep a lock during the read-update/insert cycle in import.

[gnupg.git] / g10 / compress.c

diff --git a/g10/compress.c b/g10/compress.c
index c34beec..61bb756 100644 (file)
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /* Note that the code in compress-bz2.c is nearly identical to the
@@ -38,7 +38,7 @@
 #endif
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "filter.h"
 #include "main.h"
@@ -182,7 +182,7 @@ do_uncompress( compress_filter_context_t *zfx, z_stream *zs,
            nread = iobuf_read( a, zfx->inbuf + n, count );
            if( nread == -1 ) nread = 0;
            n += nread;
-           /* Algo 1 has no zlib header which requires us to to give
+           /* Algo 1 has no zlib header which requires us to give
             * inflate an extra dummy byte to read. To be on the safe
             * side we allow for up to 4 ff bytes.  */
            if( nread < count && zfx->algo == 1 && zfx->algo1hack < 4) {