Bug 1287005 - Normalize line endings in dom/; r?khuey
MozReview-Commit-ID: 7eswrAlmJno
--- a/dom/media/gmp/rlz/lib/assert.h
+++ b/dom/media/gmp/rlz/lib/assert.h
@@ -1,14 +1,14 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef FAKE_ASSERT_H_
-#define FAKE_ASSERT_H_
-
-#include <assert.h>
-
-#define ASSERT_STRING(x) { assert(false); }
-#define VERIFY(x) { assert(x); };
-
-#endif
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef FAKE_ASSERT_H_
+#define FAKE_ASSERT_H_
+
+#include <assert.h>
+
+#define ASSERT_STRING(x) { assert(false); }
+#define VERIFY(x) { assert(x); };
+
+#endif
--- a/dom/media/gmp/rlz/sha256.c
+++ b/dom/media/gmp/rlz/sha256.c
@@ -7,23 +7,23 @@
#include "sha256.h"
#include "string.h"
#include "prcpucfg.h"
#if defined(NSS_X86) || defined(SHA_NO_LONG_LONG)
#define NOUNROLL512 1
#undef HAVE_LONG_LONG
#endif
-
-#define SHA256_BLOCK_LENGTH 64 /* bytes */
-
-typedef enum _SECStatus {
- SECWouldBlock = -2,
- SECFailure = -1,
- SECSuccess = 0
+
+#define SHA256_BLOCK_LENGTH 64 /* bytes */
+
+typedef enum _SECStatus {
+ SECWouldBlock = -2,
+ SECFailure = -1,
+ SECSuccess = 0
} SECStatus;
/* ============= Common constants and defines ======================= */
#define W ctx->u.w
#define B ctx->u.b
#define H ctx->h
--- a/dom/media/gmp/rlz/sha256.h
+++ b/dom/media/gmp/rlz/sha256.h
@@ -8,39 +8,39 @@
#ifndef _SHA256_H_
#define _SHA256_H_
#define SHA256_LENGTH 32
#include "prtypes.h" /* for PRUintXX */
#include "prlong.h"
-#ifdef __cplusplus
-extern "C" {
+#ifdef __cplusplus
+extern "C" {
#endif
-struct SHA256Context {
- union {
- PRUint32 w[64]; /* message schedule, input buffer, plus 48 words */
- PRUint8 b[256];
- } u;
- PRUint32 h[8]; /* 8 state variables */
- PRUint32 sizeHi,sizeLo; /* 64-bit count of hashed bytes. */
+struct SHA256Context {
+ union {
+ PRUint32 w[64]; /* message schedule, input buffer, plus 48 words */
+ PRUint8 b[256];
+ } u;
+ PRUint32 h[8]; /* 8 state variables */
+ PRUint32 sizeHi,sizeLo; /* 64-bit count of hashed bytes. */
};
typedef struct SHA256Context SHA256Context;
extern void
SHA256_Begin(SHA256Context *ctx);
extern void
SHA256_Update(SHA256Context *ctx, const unsigned char *input,
unsigned int inputLen);
extern void
SHA256_End(SHA256Context *ctx, unsigned char *digest,
unsigned int *digestLen, unsigned int maxDigestLen);
-#ifdef __cplusplus
+#ifdef __cplusplus
} /* extern C */
#endif
#endif /* _SHA256_H_ */