core: INCOMPATIBLE CHANGE: Name repo files with their type (e.g. .dirmeta)

This makes inspection easier.  Internally the code gets simpler because
metadata and files are more unified; there is just one object type.
This commit is contained in:
Colin Walters committed 2011-12-12 12:29:09 -05:00
1 parent db9b7b7be6
commit b8e8b58585
13 files changed
+295 -292

No files matched your search

+18 -2
View File
@@ -163,6 +163,8 @@ ot_gio_splice_and_checksum (GOutputStream *out,
gboolean ret = FALSE;
GChecksum *ret_checksum = NULL;
g_return_val_if_fail (out != NULL || out_checksum != NULL, FALSE);
if (out_checksum)
ret_checksum = g_checksum_new (G_CHECKSUM_SHA256);
@@ -176,8 +178,11 @@ ot_gio_splice_and_checksum (GOutputStream *out,
goto out;
if (ret_checksum)
g_checksum_update (ret_checksum, (guint8*)buf, bytes_read);
if (!g_output_stream_write_all (out, buf, bytes_read, &bytes_written, cancellable, error))
goto out;
if (out)
{
if (!g_output_stream_write_all (out, buf, bytes_read, &bytes_written, cancellable, error))
goto out;
}
}
while (bytes_read > 0);
}
@@ -194,6 +199,17 @@ ot_gio_splice_and_checksum (GOutputStream *out,
return ret;
}
gboolean
ot_gio_checksum_stream (GInputStream *in,
GChecksum **out_checksum,
GCancellable *cancellable,
GError **error)
{
if (!out_checksum)
return TRUE;
return ot_gio_splice_and_checksum (NULL, in, out_checksum, cancellable, error);
}
gboolean
ot_gfile_merge_dirs (GFile *destination,
GFile *src,
+5
View File
@@ -51,6 +51,11 @@ gboolean ot_gio_splice_and_checksum (GOutputStream *out,
GCancellable *cancellable,
GError **error);
gboolean ot_gio_checksum_stream (GInputStream *in,
GChecksum **out_checksum,
GCancellable *cancellable,
GError **error);
gboolean ot_gfile_merge_dirs (GFile *destination,
GFile *src,
GCancellable *cancellable,