<p>Denis 'GNUtoo' Carikli has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23240">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/bincfg: Fix some whitespaces<br><br>Change-Id: I674a3f58a576948dc3c0cd32ef06b42ef13353ee<br>Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org><br>---<br>M util/bincfg/bincfg.y<br>1 file changed, 19 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/23240/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/bincfg/bincfg.y b/util/bincfg/bincfg.y</span><br><span>index 7a098cd..28feb59 100644</span><br><span>--- a/util/bincfg/bincfg.y</span><br><span>+++ b/util/bincfg/bincfg.y</span><br><span>@@ -81,7 +81,8 @@</span><br><span> static void append_field_to_blob (unsigned char b[], unsigned int w)</span><br><span> {</span><br><span> unsigned int i, j;</span><br><span style="color: hsl(0, 100%, 40%);">- binary->blb = (unsigned char *) realloc (binary->blb, binary->bloblen + w);</span><br><span style="color: hsl(120, 100%, 40%);">+ binary->blb = (unsigned char *) realloc (binary->blb,</span><br><span style="color: hsl(120, 100%, 40%);">+ binary->bloblen + w);</span><br><span> check_pointer(binary->blb);</span><br><span> for (j = 0, i = binary->bloblen; i < binary->bloblen + w; i++, j++) {</span><br><span> binary->blb[i] = VALID_BIT | (b[j] & 1);</span><br><span>@@ -98,7 +99,9 @@</span><br><span> bf->value = value & 0xffffffff;</span><br><span> i = (1 << bf->width) - 1;</span><br><span> if (bf->width > 8 * sizeof (unsigned int)) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Overflow in bitfield, truncating bits to fit\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Overflow in bitfield, truncating bits to"</span><br><span style="color: hsl(120, 100%, 40%);">+ " fit\n");</span><br><span> bf->value = value & i;</span><br><span> }</span><br><span> //fprintf(stderr, "Setting `%s` = %d\n", bf->name, bf->value);</span><br><span>@@ -144,7 +147,8 @@</span><br><span> struct field *putsym (char const *sym_name, unsigned int w)</span><br><span> {</span><br><span> if (getsym(sym_name)) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Cannot add duplicate named bitfield `%s`\n", sym_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Cannot add duplicate named bitfield `%s`\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sym_name);</span><br><span> return 0;</span><br><span> }</span><br><span> struct field *ptr = (struct field *) malloc (sizeof (struct field));</span><br><span>@@ -339,7 +343,8 @@</span><br><span> struct field *ptr;</span><br><span> </span><br><span> if (binary->bloblen % 8) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf (stderr, "ERROR: Spec must be multiple of 8 bits wide\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf (stderr,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ERROR: Spec must be multiple of 8 bits wide\n");</span><br><span> exit (1);</span><br><span> }</span><br><span> </span><br><span>@@ -404,7 +409,8 @@</span><br><span> ;</span><br><span> </span><br><span> blob:</span><br><span style="color: hsl(0, 100%, 40%);">- '%' eof { generate_setter_bitfields(binary->actualblob); }</span><br><span style="color: hsl(120, 100%, 40%);">+ '%' eof { generate_setter_bitfields(</span><br><span style="color: hsl(120, 100%, 40%);">+ binary->actualblob); }</span><br><span> ;</span><br><span> </span><br><span> spec:</span><br><span>@@ -504,7 +510,8 @@</span><br><span> </span><br><span> /* Open output and parse string - output to fp */</span><br><span> if ((fp = fopen(argv[3], "wb")) == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error: Could not open output file: %s\n",argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Error: Could not open output file: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ argv[3]);</span><br><span> exit(1);</span><br><span> }</span><br><span> ret = parse_string(parsestring);</span><br><span>@@ -520,20 +527,23 @@</span><br><span> </span><br><span> /* Load Actual Binary */</span><br><span> if ((fp = fopen(argv[3], "rb")) == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error: Could not open binary file: %s\n",argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Error: Could not open binary file: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ argv[3]);</span><br><span> exit(1);</span><br><span> }</span><br><span> fseek(fp, 0, SEEK_END);</span><br><span> binary->lenactualblob = ftell(fp);</span><br><span> fseek(fp, 0, SEEK_SET);</span><br><span style="color: hsl(0, 100%, 40%);">- binary->actualblob = (unsigned char *) malloc (binary->lenactualblob);</span><br><span style="color: hsl(120, 100%, 40%);">+ binary->actualblob = (unsigned char *)malloc(</span><br><span style="color: hsl(120, 100%, 40%);">+ binary->lenactualblob);</span><br><span> check_pointer(binary->actualblob);</span><br><span> fread(binary->actualblob, 1, binary->lenactualblob, fp);</span><br><span> fclose(fp);</span><br><span> </span><br><span> /* Open output and parse - output to fp */</span><br><span> if ((fp = fopen(argv[4], "w")) == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Error: Could not open output file: %s\n",argv[4]);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Error: Could not open output file: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ argv[4]);</span><br><span> exit(1);</span><br><span> }</span><br><span> ret = parse_string(parsestring);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23240">change 23240</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23240"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I674a3f58a576948dc3c0cd32ef06b42ef13353ee </div>
<div style="display:none"> Gerrit-Change-Number: 23240 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> </div>