Run clang-format

find . \( -name "*.cpp" -or -name "*.h"  -or -name "*.c"  -or -name "*.cc" \) -exec clang-format -i {} \;

If you reached this file doing a git blame, please see README.contributors (instructions added 2 commits in the future to this one)

1 files changed, 125 insertions, 169 deletions

diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
index bb93cd4d..3e0d69bb 100644
--- a/glib/poppler-attachment.cc
+++ b/glib/poppler-attachment.cc
@@ -37,128 +37,109 @@
 
 struct PopplerAttachmentPrivate
 {
-  Object obj_stream{};
+    Object obj_stream {};
 };
 
-static void poppler_attachment_finalize (GObject *obj);
+static void poppler_attachment_finalize(GObject *obj);
 
-G_DEFINE_TYPE_WITH_PRIVATE (PopplerAttachment, poppler_attachment, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE(PopplerAttachment, poppler_attachment, G_TYPE_OBJECT)
 
-#define GET_PRIVATE(obj) ((PopplerAttachmentPrivate *) poppler_attachment_get_instance_private (obj))
+#define GET_PRIVATE(obj) ((PopplerAttachmentPrivate *)poppler_attachment_get_instance_private(obj))
 
-static void
-poppler_attachment_init (PopplerAttachment *attachment)
+static void poppler_attachment_init(PopplerAttachment *attachment)
 {
-  void *place;
+    void *place;
 
-  place = GET_PRIVATE (attachment);
-  new (place) PopplerAttachmentPrivate();
+    place = GET_PRIVATE(attachment);
+    new (place) PopplerAttachmentPrivate();
 }
 
-static void
-poppler_attachment_class_init (PopplerAttachmentClass *klass)
+static void poppler_attachment_class_init(PopplerAttachmentClass *klass)
 {
-  G_OBJECT_CLASS (klass)->finalize = poppler_attachment_finalize;
+    G_OBJECT_CLASS(klass)->finalize = poppler_attachment_finalize;
 }
 
-static void
-poppler_attachment_finalize (GObject *obj)
+static void poppler_attachment_finalize(GObject *obj)
 {
-  PopplerAttachment *attachment;
-  PopplerAttachmentPrivate *priv;
+    PopplerAttachment *attachment;
+    PopplerAttachmentPrivate *priv;
 
-  attachment = (PopplerAttachment *) obj;
-  priv = GET_PRIVATE (attachment);
+    attachment = (PopplerAttachment *)obj;
+    priv = GET_PRIVATE(attachment);
 
-  if (attachment->name)
-    g_free (attachment->name);
-  attachment->name = nullptr;
+    if (attachment->name)
+        g_free(attachment->name);
+    attachment->name = nullptr;
 
-  if (attachment->description)
-    g_free (attachment->description);
-  attachment->description = nullptr;
-  
-  if (attachment->checksum)
-    g_string_free (attachment->checksum, TRUE);
-  attachment->checksum = nullptr;
+    if (attachment->description)
+        g_free(attachment->description);
+    attachment->description = nullptr;
 
-  priv->~PopplerAttachmentPrivate ();
+    if (attachment->checksum)
+        g_string_free(attachment->checksum, TRUE);
+    attachment->checksum = nullptr;
 
-  G_OBJECT_CLASS (poppler_attachment_parent_class)->finalize (obj);
+    priv->~PopplerAttachmentPrivate();
+
+    G_OBJECT_CLASS(poppler_attachment_parent_class)->finalize(obj);
 }
 
 /* Public functions */
 
-PopplerAttachment *
-_poppler_attachment_new (FileSpec *emb_file)
+PopplerAttachment *_poppler_attachment_new(FileSpec *emb_file)
 {
-  PopplerAttachment *attachment;
-  PopplerAttachmentPrivate *priv;
-  EmbFile *embFile;
-
-  g_assert (emb_file != nullptr);
-
-  attachment = (PopplerAttachment *) g_object_new (POPPLER_TYPE_ATTACHMENT, nullptr);
-  priv = GET_PRIVATE (attachment);
-
-  if (emb_file->getFileName ())
-    attachment->name = _poppler_goo_string_to_utf8 (emb_file->getFileName ());
-  if (emb_file->getDescription ())
-    attachment->description = _poppler_goo_string_to_utf8 (emb_file->getDescription ());
-
-  embFile = emb_file->getEmbeddedFile();
-  if (embFile != nullptr && embFile->streamObject()->isStream())
-    {
-      attachment->size = embFile->size ();
-
-      if (embFile->createDate ())
-        {
-          time_t aux;
-          _poppler_convert_pdf_date_to_gtime (embFile->createDate (), &aux);
-          attachment->ctime = (GTime)aux; // FIXME This will overflow on dates from after 2038
+    PopplerAttachment *attachment;
+    PopplerAttachmentPrivate *priv;
+    EmbFile *embFile;
+
+    g_assert(emb_file != nullptr);
+
+    attachment = (PopplerAttachment *)g_object_new(POPPLER_TYPE_ATTACHMENT, nullptr);
+    priv = GET_PRIVATE(attachment);
+
+    if (emb_file->getFileName())
+        attachment->name = _poppler_goo_string_to_utf8(emb_file->getFileName());
+    if (emb_file->getDescription())
+        attachment->description = _poppler_goo_string_to_utf8(emb_file->getDescription());
+
+    embFile = emb_file->getEmbeddedFile();
+    if (embFile != nullptr && embFile->streamObject()->isStream()) {
+        attachment->size = embFile->size();
+
+        if (embFile->createDate()) {
+            time_t aux;
+            _poppler_convert_pdf_date_to_gtime(embFile->createDate(), &aux);
+            attachment->ctime = (GTime)aux; // FIXME This will overflow on dates from after 2038
         }
-      if (embFile->modDate ())
-        {
-          time_t aux;
-          _poppler_convert_pdf_date_to_gtime (embFile->modDate (), &aux);
-          attachment->mtime = (GTime)aux; // FIXME This will overflow on dates from after 2038
+        if (embFile->modDate()) {
+            time_t aux;
+            _poppler_convert_pdf_date_to_gtime(embFile->modDate(), &aux);
+            attachment->mtime = (GTime)aux; // FIXME This will overflow on dates from after 2038
         }
 
-      if (embFile->checksum () && embFile->checksum ()->getLength () > 0)
-        attachment->checksum = g_string_new_len (embFile->checksum ()->c_str (),
-                                                 embFile->checksum ()->getLength ());
-      priv->obj_stream = embFile->streamObject()->copy();
-    }
-  else
-    {
-      g_warning ("Missing stream object for embedded file");
-      g_clear_object (&attachment);
+        if (embFile->checksum() && embFile->checksum()->getLength() > 0)
+            attachment->checksum = g_string_new_len(embFile->checksum()->c_str(), embFile->checksum()->getLength());
+        priv->obj_stream = embFile->streamObject()->copy();
+    } else {
+        g_warning("Missing stream object for embedded file");
+        g_clear_object(&attachment);
     }
 
-  return attachment;
+    return attachment;
 }
 
-static gboolean
-save_helper (const gchar  *buf,
-	     gsize         count,
-	     gpointer      data,
-	     GError      **error)
+static gboolean save_helper(const gchar *buf, gsize count, gpointer data, GError **error)
 {
-  FILE *f = (FILE *) data;
-  gsize n;
-
-  n = fwrite (buf, 1, count, f);
-  if (n != count)
-    {
-      g_set_error (error,
-		   G_FILE_ERROR,
-		   g_file_error_from_errno (errno),
-		   _("Error writing to image file: %s"),
-		   g_strerror (errno));
-      return FALSE;
+    FILE *f = (FILE *)data;
+    gsize n;
+
+    n = fwrite(buf, 1, count, f);
+    if (n != count) {
+        g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), _("Error writing to image file: %s"), g_strerror(errno));
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 /**
@@ -166,54 +147,39 @@ save_helper (const gchar  *buf,
  * @attachment: A #PopplerAttachment.
  * @filename: name of file to save
  * @error: (allow-none): return location for error, or %NULL.
- * 
+ *
  * Saves @attachment to a file indicated by @filename.  If @error is set, %FALSE
  * will be returned. Possible errors include those in the #G_FILE_ERROR domain
  * and whatever the save function generates.
- * 
+ *
  * Return value: %TRUE, if the file successfully saved
  **/
-gboolean
-poppler_attachment_save (PopplerAttachment  *attachment,
-			 const char         *filename,
-			 GError            **error)
+gboolean poppler_attachment_save(PopplerAttachment *attachment, const char *filename, GError **error)
 {
-  gboolean result;
-  FILE *f;
-  
-  g_return_val_if_fail (POPPLER_IS_ATTACHMENT (attachment), FALSE);
-
-  f = openFile (filename, "wb");
-
-  if (f == nullptr)
-    {
-      gchar *display_name = g_filename_display_name (filename);
-      g_set_error (error,
-		   G_FILE_ERROR,
-		   g_file_error_from_errno (errno),
-		   _("Failed to open '%s' for writing: %s"),
-		   display_name,
-		   g_strerror (errno));
-      g_free (display_name);
-      return FALSE;
+    gboolean result;
+    FILE *f;
+
+    g_return_val_if_fail(POPPLER_IS_ATTACHMENT(attachment), FALSE);
+
+    f = openFile(filename, "wb");
+
+    if (f == nullptr) {
+        gchar *display_name = g_filename_display_name(filename);
+        g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), _("Failed to open '%s' for writing: %s"), display_name, g_strerror(errno));
+        g_free(display_name);
+        return FALSE;
     }
 
-  result = poppler_attachment_save_to_callback (attachment, save_helper, f, error);
-
-  if (fclose (f) < 0)
-    {
-      gchar *display_name = g_filename_display_name (filename);
-      g_set_error (error,
-		   G_FILE_ERROR,
-		   g_file_error_from_errno (errno),
-		   _("Failed to close '%s', all data may not have been saved: %s"),
-		   display_name,
-		   g_strerror (errno));
-      g_free (display_name);
-      return FALSE;
+    result = poppler_attachment_save_to_callback(attachment, save_helper, f, error);
+
+    if (fclose(f) < 0) {
+        gchar *display_name = g_filename_display_name(filename);
+        g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), _("Failed to close '%s', all data may not have been saved: %s"), display_name, g_strerror(errno));
+        g_free(display_name);
+        return FALSE;
     }
 
-  return result;
+    return result;
 }
 
 #define BUF_SIZE 1024
@@ -224,56 +190,46 @@ poppler_attachment_save (PopplerAttachment  *attachment,
  * @save_func: (scope call): a function that is called to save each block of data that the save routine generates.
  * @user_data: user data to pass to the save function.
  * @error: (allow-none): return location for error, or %NULL.
- * 
+ *
  * Saves @attachment by feeding the produced data to @save_func. Can be used
  * when you want to store the attachment to something other than a file, such as
  * an in-memory buffer or a socket. If @error is set, %FALSE will be
  * returned. Possible errors include those in the #G_FILE_ERROR domain and
  * whatever the save function generates.
- * 
+ *
  * Return value: %TRUE, if the save successfully completed
  **/
-gboolean
-poppler_attachment_save_to_callback (PopplerAttachment          *attachment,
-				     PopplerAttachmentSaveFunc   save_func,
-				     gpointer                    user_data,
-				     GError                    **error)
+gboolean poppler_attachment_save_to_callback(PopplerAttachment *attachment, PopplerAttachmentSaveFunc save_func, gpointer user_data, GError **error)
 {
-  PopplerAttachmentPrivate *priv;
-  Stream *stream;
-  gchar buf[BUF_SIZE]; 
-  int i;
-  gboolean eof_reached = FALSE;
-
-  g_return_val_if_fail (POPPLER_IS_ATTACHMENT (attachment), FALSE);
-  priv = GET_PRIVATE (attachment);
-
-  stream = priv->obj_stream.getStream();
-  stream->reset();
-
-  do
-    {
-      int data;
-
-      for (i = 0; i < BUF_SIZE; i++)
-	{
-	  data = stream->getChar ();
-	  if (data == EOF)
-	    {
-	      eof_reached = TRUE;
-	      break;
-	    }
-	  buf[i] = data;
-	}
-
-      if (i > 0)
-	{
-	  if (! (save_func) (buf, i, user_data, error))
-	    return FALSE;
-	}
-    }
-  while (! eof_reached);
+    PopplerAttachmentPrivate *priv;
+    Stream *stream;
+    gchar buf[BUF_SIZE];
+    int i;
+    gboolean eof_reached = FALSE;
+
+    g_return_val_if_fail(POPPLER_IS_ATTACHMENT(attachment), FALSE);
+    priv = GET_PRIVATE(attachment);
+
+    stream = priv->obj_stream.getStream();
+    stream->reset();
+
+    do {
+        int data;
+
+        for (i = 0; i < BUF_SIZE; i++) {
+            data = stream->getChar();
+            if (data == EOF) {
+                eof_reached = TRUE;
+                break;
+            }
+            buf[i] = data;
+        }
 
+        if (i > 0) {
+            if (!(save_func)(buf, i, user_data, error))
+                return FALSE;
+        }
+    } while (!eof_reached);
 
-  return TRUE;
+    return TRUE;
 }